Merge pull request #1004 from cloudinary/feature/cleanup-cron

Cleanup Cloudinary cron on deactivation and full cleanup

Author: tharsheblows

php/class-cron.php

@@ -448,4 +448,12 @@ public function cleanup_failed_cron() {
 		$this->locker->delete_lock_file( $this->init_time );
 	}
 
+	/**
+	 * Allow cleanup of the locker.
+	 *
+	 * @return void
+	 */
+	public function cleanup_locker() {
+		$this->locker->delete_lock_file();
+	}
 }

php/class-deactivation.php

@@ -479,6 +479,8 @@ protected function cleanup() {
 		$this->cleanup_post_type();
 		$this->drop_tables();
 		$this->cleanup_options();
+		$this->cleanup_cron();
+		$this->cleanup_legacy_cron();
 
 		// If we got this far, let's remove the cron event.
 		wp_clear_scheduled_hook( 'cloudinary_cleanup_event' );
@@ -600,4 +602,51 @@ protected function cleanup_options() {
 			delete_transient( $key );
 		}
 	}
+
+	/**
+	 * Remove all cron-related tasks.
+	 *
+	 * @return void
+	 */
+	protected function cleanup_cron() {
+		// Get the Cron instance.
+		$cron_instance = Cron::get_instance();
+		$schedule      = $cron_instance->get_schedule();
+
+		// Unregister all registered schedules.
+		if ( ! empty( $schedule ) ) {
+			foreach ( array_keys( $schedule ) as $schedule_name ) {
+				$cron_instance->unregister_schedule( $schedule_name );
+			}
+		}
+
+		// Remove any lock files or objects used by the Locker instance.
+		$cron_instance->cleanup_locker();
+
+		// Delete the cron schedule option saved in database.
+		delete_option( Cron::CRON_META_KEY );
+	}
+
+	/**
+	 * Cleanup legacy cron jobs.
+	 *
+	 * @return void
+	 */
+	protected function cleanup_legacy_cron() {
+		wp_clear_scheduled_hook( 'cloudinary_status' );
+
+		$jobs = array(
+			'cloudinary_rest_api_connectivity',
+			'cloudinary_resume_queue',
+			'cloudinary_resume_upgrade',
+			'cloudinary_sync_items',
+		);
+
+		foreach ( $jobs as $job ) {
+			$time = wp_next_scheduled( $job );
+			if ( false !== $time ) {
+				wp_clear_scheduled_hook( $job );
+			}
+		}
+	}
 }