resque / php-resque

resque-scheduler.php

Indentation +2 added lines, -2 removed lines

@@ -54,8 +54,8 @@
 
 $PREFIX = getenv('PREFIX');
 if(!empty($PREFIX)) {
-    fwrite(STDOUT, '*** Prefix set to '.$PREFIX."\n");
-    Resque_Redis::prefix($PREFIX);
+	fwrite(STDOUT, '*** Prefix set to '.$PREFIX."\n");
+	Resque_Redis::prefix($PREFIX);
 }
 
 $worker = new ResqueScheduler_Worker();

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 
 $REDIS_BACKEND = getenv('REDIS_BACKEND');
 $REDIS_BACKEND_DB = getenv('REDIS_BACKEND_DB');
-if(!empty($REDIS_BACKEND)) {
+if (!empty($REDIS_BACKEND)) {
 	if (empty($REDIS_BACKEND_DB)) 
 		Resque::setBackend($REDIS_BACKEND);
 	else
@@ -28,33 +28,33 @@ 
 $LOGGING = getenv('LOGGING');
 $VERBOSE = getenv('VERBOSE');
 $VVERBOSE = getenv('VVERBOSE');
-if(!empty($LOGGING) || !empty($VERBOSE)) {
+if (!empty($LOGGING) || !empty($VERBOSE)) {
 	$logLevel = ResqueScheduler_Worker::LOG_NORMAL;
 }
-else if(!empty($VVERBOSE)) {
+else if (!empty($VVERBOSE)) {
 	$logLevel = ResqueScheduler_Worker::LOG_VERBOSE;
 }
 
 // Check for jobs every $interval seconds
 $interval = 5;
 $INTERVAL = getenv('INTERVAL');
-if(!empty($INTERVAL)) {
+if (!empty($INTERVAL)) {
 	$interval = $INTERVAL;
 }
 
 // Load the user's application if one exists
 $APP_INCLUDE = getenv('APP_INCLUDE');
-if($APP_INCLUDE) {
-	if(!file_exists($APP_INCLUDE)) {
-		die('APP_INCLUDE ('.$APP_INCLUDE.") does not exist.\n");
+if ($APP_INCLUDE) {
+	if (!file_exists($APP_INCLUDE)) {
+		die('APP_INCLUDE (' . $APP_INCLUDE . ") does not exist.\n");
 	}
 
 	require_once $APP_INCLUDE;
 }
 
 $PREFIX = getenv('PREFIX');
-if(!empty($PREFIX)) {
-    fwrite(STDOUT, '*** Prefix set to '.$PREFIX."\n");
+if (!empty($PREFIX)) {
+    fwrite(STDOUT, '*** Prefix set to ' . $PREFIX . "\n");
     Resque_Redis::prefix($PREFIX);
 }
 

Braces +7 added lines, -7 removed lines

@@ -17,11 +17,12 @@ 
 $REDIS_BACKEND = getenv('REDIS_BACKEND');
 $REDIS_BACKEND_DB = getenv('REDIS_BACKEND_DB');
 if(!empty($REDIS_BACKEND)) {
-	if (empty($REDIS_BACKEND_DB)) 
-		Resque::setBackend($REDIS_BACKEND);
-	else
-		Resque::setBackend($REDIS_BACKEND, $REDIS_BACKEND_DB);
-}
+	if (empty($REDIS_BACKEND_DB)) {
+			Resque::setBackend($REDIS_BACKEND);
+	} else {
+			Resque::setBackend($REDIS_BACKEND, $REDIS_BACKEND_DB);
+	}
+	}
 
 // Set log level for resque-scheduler
 $logLevel = 0;
@@ -30,8 +31,7 @@ 
 $VVERBOSE = getenv('VVERBOSE');
 if(!empty($LOGGING) || !empty($VERBOSE)) {
 	$logLevel = ResqueScheduler_Worker::LOG_NORMAL;
-}
-else if(!empty($VVERBOSE)) {
+} else if(!empty($VVERBOSE)) {
 	$logLevel = ResqueScheduler_Worker::LOG_VERBOSE;
 }
 

lib/ResqueScheduler.php

Indentation +49 added lines, -49 removed lines

@@ -91,59 +91,59 @@
 		return Resque::redis()->llen('delayed:' . $timestamp, $timestamp);
 	}
 
-    /**
-     * Remove a delayed job from the queue
-     *
-     * note: you must specify exactly the same
-     * queue, class and arguments that you used when you added
-     * to the delayed queue
-     *
-     * also, this is an expensive operation because all delayed keys have tobe
-     * searched
-     *
-     * @param $queue
-     * @param $class
-     * @param $args
-     * @return int number of jobs that were removed
-     */
-    public static function removeDelayed($queue, $class, $args)
-    {
-       $destroyed=0;
-       $item=json_encode(self::jobToHash($queue, $class, $args));
-       $redis=Resque::redis();
+	/**
+	 * Remove a delayed job from the queue
+	 *
+	 * note: you must specify exactly the same
+	 * queue, class and arguments that you used when you added
+	 * to the delayed queue
+	 *
+	 * also, this is an expensive operation because all delayed keys have tobe
+	 * searched
+	 *
+	 * @param $queue
+	 * @param $class
+	 * @param $args
+	 * @return int number of jobs that were removed
+	 */
+	public static function removeDelayed($queue, $class, $args)
+	{
+	   $destroyed=0;
+	   $item=json_encode(self::jobToHash($queue, $class, $args));
+	   $redis=Resque::redis();
 
-       foreach($redis->keys('delayed:*') as $key)
-       {
-           $key=$redis->removePrefix($key);
-           $destroyed+=$redis->lrem($key,0,$item);
-       }
+	   foreach($redis->keys('delayed:*') as $key)
+	   {
+		   $key=$redis->removePrefix($key);
+		   $destroyed+=$redis->lrem($key,0,$item);
+	   }
 
-       return $destroyed;
-    }
+	   return $destroyed;
+	}
 
-    /**
-     * removed a delayed job queued for a specific timestamp
-     *
-     * note: you must specify exactly the same
-     * queue, class and arguments that you used when you added
-     * to the delayed queue
-     *
-     * @param $timestamp
-     * @param $queue
-     * @param $class
-     * @param $args
-     * @return mixed
-     */
-    public static function removeDelayedJobFromTimestamp($timestamp, $queue, $class, $args)
-    {
-        $key = 'delayed:' . self::getTimestamp($timestamp);
-        $item = json_encode(self::jobToHash($queue, $class, $args));
-        $redis = Resque::redis();
-        $count = $redis->lrem($key, 0, $item);
-        self::cleanupTimestamp($key, $timestamp);
+	/**
+	 * removed a delayed job queued for a specific timestamp
+	 *
+	 * note: you must specify exactly the same
+	 * queue, class and arguments that you used when you added
+	 * to the delayed queue
+	 *
+	 * @param $timestamp
+	 * @param $queue
+	 * @param $class
+	 * @param $args
+	 * @return mixed
+	 */
+	public static function removeDelayedJobFromTimestamp($timestamp, $queue, $class, $args)
+	{
+		$key = 'delayed:' . self::getTimestamp($timestamp);
+		$item = json_encode(self::jobToHash($queue, $class, $args));
+		$redis = Resque::redis();
+		$count = $redis->lrem($key, 0, $item);
+		self::cleanupTimestamp($key, $timestamp);
 
-        return $count;
-    }
+		return $count;
+	}
 	
 	/**
 	 * Generate hash of all job properties to be saved in the scheduled queue.

Spacing +6 added lines, -6 removed lines

@@ -108,14 +108,14 @@
      */
     public static function removeDelayed($queue, $class, $args)
     {
-       $destroyed=0;
-       $item=json_encode(self::jobToHash($queue, $class, $args));
-       $redis=Resque::redis();
+       $destroyed = 0;
+       $item = json_encode(self::jobToHash($queue, $class, $args));
+       $redis = Resque::redis();
 
-       foreach($redis->keys('delayed:*') as $key)
+       foreach ($redis->keys('delayed:*') as $key)
        {
-           $key=$redis->removePrefix($key);
-           $destroyed+=$redis->lrem($key,0,$item);
+           $key = $redis->removePrefix($key);
+           $destroyed += $redis->lrem($key, 0, $item);
        }
 
        return $destroyed;

Braces +2 added lines, -4 removed lines

@@ -220,8 +220,7 @@ 
 	{
 		if ($at === null) {
 			$at = time();
-		}
-		else {
+		} else {
 			$at = self::getTimestamp($at);
 		}
 	
@@ -261,8 +260,7 @@ 
 	{
 		if (empty($class)) {
 			throw new Resque_Exception('Jobs must be given a class.');
-		}
-		else if (empty($queue)) {
+		} else if (empty($queue)) {
 			throw new Resque_Exception('Jobs must be put in a queue.');
 		}
 		

lib/ResqueScheduler/Worker.php

Indentation +7 added lines, -7 removed lines

@@ -24,13 +24,13 @@
 	protected $interval = 5;
 	
 	/**
-	* The primary loop for a worker.
-	*
-	* Every $interval (seconds), the scheduled queue will be checked for jobs
-	* that should be pushed to Resque.
-	*
-	* @param int $interval How often to check schedules.
-	*/
+	 * The primary loop for a worker.
+	 *
+	 * Every $interval (seconds), the scheduled queue will be checked for jobs
+	 * that should be pushed to Resque.
+	 *
+	 * @param int $interval How often to check schedules.
+	 */
 	public function work($interval = null)
 	{
 		if ($interval !== null) {

Spacing +4 added lines, -4 removed lines

@@ -73,7 +73,7 @@ 
 	{
 		$item = null;
 		while ($item = ResqueScheduler::nextItemForTimestamp($timestamp)) {
-			$this->log('queueing ' . $item['class'] . ' in ' . $item['queue'] .' [delayed]');
+			$this->log('queueing ' . $item['class'] . ' in ' . $item['queue'] . ' [delayed]');
 			
 			Resque_Event::trigger('beforeDelayedEnqueue', array(
 				'queue' => $item['queue'],
@@ -105,7 +105,7 @@ 
 	 */
 	private function updateProcLine($status)
 	{
-		if(function_exists('setproctitle')) {
+		if (function_exists('setproctitle')) {
 			setproctitle('resque-scheduler-' . ResqueScheduler::VERSION . ': ' . $status);
 		}
 	}
@@ -117,10 +117,10 @@ 
 	 */
 	public function log($message)
 	{
-		if($this->logLevel == self::LOG_NORMAL) {
+		if ($this->logLevel == self::LOG_NORMAL) {
 			fwrite(STDOUT, "*** " . $message . "\n");
 		}
-		else if($this->logLevel == self::LOG_VERBOSE) {
+		else if ($this->logLevel == self::LOG_VERBOSE) {
 			fwrite(STDOUT, "** [" . strftime('%T %Y-%m-%d') . "] " . $message . "\n");
 		}
 	}

Braces +1 added lines, -2 removed lines

@@ -119,8 +119,7 @@
 	{
 		if($this->logLevel == self::LOG_NORMAL) {
 			fwrite(STDOUT, "*** " . $message . "\n");
-		}
-		else if($this->logLevel == self::LOG_VERBOSE) {
+		} else if($this->logLevel == self::LOG_VERBOSE) {
 			fwrite(STDOUT, "** [" . strftime('%T %Y-%m-%d') . "] " . $message . "\n");
 		}
 	}