Merge pull request #602 from ProgressPlanner/filip/alternative-lock

Alternative (better) lock when adding new tasks

Author: aristath

classes/class-suggested-tasks-db.php

@@ -36,17 +36,22 @@ public function add( $data ) {
 			return 0;
 		}
 
-		// Set lock transient.
-		$transient_key = 'prpl_task_lock_' . $data['task_id'];
-
-		// Check if the task is already being processed.
-		if ( \get_transient( $transient_key ) ) {
-			return 0;
+		$lock_key   = 'prpl_task_lock_' . $data['task_id'];
+		$lock_value = \time();
+
+		// add_option will return false if the option is already there.
+		if ( ! \add_option( $lock_key, $lock_value, '', false ) ) {
+			$current = \get_option( $lock_key );
+
+			// If lock is stale (older than 30s), take over.
+			if ( $current && ( $current < \time() - 30 ) ) {
+				\update_option( $lock_key, $lock_value );
+			} else {
+				error_log( 'Lock for: ' . $data['task_id'] ); // TODO: remove this after testing.
+				return 0; // Other process is using it.
+			}
 		}
 
-		// Set lock transient.
-		\set_transient( $transient_key, true, 5 );
-
 		// Check if we have an existing task with the same title.
 		$posts = $this->get_tasks_by(
 			[
@@ -64,7 +69,7 @@ public function add( $data ) {
 
 		// If we have an existing task, skip.
 		if ( ! empty( $posts ) ) {
-			\delete_transient( $transient_key );
+			\delete_option( $lock_key );
 			return $posts[0]->ID;
 		}
 
@@ -100,57 +105,60 @@ public function add( $data ) {
 				break;
 		}
 
-		$post_id = \wp_insert_post( $args );
+		try {
+			$post_id = \wp_insert_post( $args );
 
-		// Add terms if they don't exist.
-		foreach ( [ 'category', 'provider_id' ] as $context ) {
-			$taxonomy_name = \str_replace( '_id', '', $context );
-			$term          = \get_term_by( 'name', $data[ $context ], "prpl_recommendations_$taxonomy_name" );
-			if ( ! $term ) {
-				\wp_insert_term( $data[ $context ], "prpl_recommendations_$taxonomy_name" );
+			// Add terms if they don't exist.
+			foreach ( [ 'category', 'provider_id' ] as $context ) {
+				$taxonomy_name = \str_replace( '_id', '', $context );
+				$term          = \get_term_by( 'name', $data[ $context ], "prpl_recommendations_$taxonomy_name" );
+				if ( ! $term ) {
+					\wp_insert_term( $data[ $context ], "prpl_recommendations_$taxonomy_name" );
+				}
 			}
-		}
-
-		// Set the task category.
-		\wp_set_post_terms( $post_id, $data['category'], 'prpl_recommendations_category' );
-
-		// Set the task provider.
-		\wp_set_post_terms( $post_id, $data['provider_id'], 'prpl_recommendations_provider' );
 
-		// Set the task parent.
-		if ( ! empty( $data['parent'] ) ) {
-			$parent = \get_post( $data['parent'] );
-			if ( $parent ) {
-				\wp_update_post(
-					[
-						'ID'          => $post_id,
-						'post_parent' => $parent->ID,
-					]
-				);
+			// Set the task category.
+			\wp_set_post_terms( $post_id, $data['category'], 'prpl_recommendations_category' );
+
+			// Set the task provider.
+			\wp_set_post_terms( $post_id, $data['provider_id'], 'prpl_recommendations_provider' );
+
+			// Set the task parent.
+			if ( ! empty( $data['parent'] ) ) {
+				$parent = \get_post( $data['parent'] );
+				if ( $parent ) {
+					\wp_update_post(
+						[
+							'ID'          => $post_id,
+							'post_parent' => $parent->ID,
+						]
+					);
+				}
 			}
-		}
 
-		// Set other meta.
-		$default_keys = [
-			'title',
-			'description',
-			'status',
-			'category',
-			'provider_id',
-			'parent',
-			'order',
-			'post_status',
-		];
-		foreach ( $data as $key => $value ) {
-			if ( \in_array( $key, $default_keys, true ) ) {
-				continue;
+			// Set other meta.
+			$default_keys = [
+				'title',
+				'description',
+				'status',
+				'category',
+				'provider_id',
+				'parent',
+				'order',
+				'post_status',
+			];
+			foreach ( $data as $key => $value ) {
+				if ( \in_array( $key, $default_keys, true ) ) {
+					continue;
+				}
+
+				\update_post_meta( $post_id, "prpl_$key", $value );
 			}
-
-			\update_post_meta( $post_id, "prpl_$key", $value );
+		} finally {
+			// Delete the lock. This executes always.
+			\delete_option( $lock_key );
 		}
 
-		\delete_transient( $transient_key );
-
 		return $post_id;
 	}