resque / php-resque

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

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");
 		}
 	}

Indentation +35 added lines, -35 removed lines

@@ -25,19 +25,19 @@ 
 	 */
 	protected $interval = 5;
 
-    /**
-     * @var boolean True if on the next iteration, the worker should shutdown.
-     */
-    private $shutdown = false;
+	/**
+	 * @var boolean True if on the next iteration, the worker should shutdown.
+	 */
+	private $shutdown = false;
 
 	/**
-	* 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) {
@@ -47,10 +47,10 @@ 
 		$this->updateProcLine('Starting');
 		$this->registerSigHandlers();
 
-        while (true) {
-            if($this->shutdown) {
-                break;
-            }
+		while (true) {
+			if($this->shutdown) {
+				break;
+			}
 			$this->handleDelayedItems();
 			$this->sleep();
 		}
@@ -136,26 +136,26 @@ 
 		}
 	}
 
-    /**
-     * Register signal handlers that a worker should respond to.
-     *
-     * TERM: Shutdown immediately and stop processing jobs.
-     * INT: Shutdown immediately and stop processing jobs.
-     * QUIT: Shutdown after the current job finishes processing.
-     */
-    private function registerSigHandlers()
-    {
-        if(!function_exists('pcntl_signal')) {
-            return;
-        }
+	/**
+	 * Register signal handlers that a worker should respond to.
+	 *
+	 * TERM: Shutdown immediately and stop processing jobs.
+	 * INT: Shutdown immediately and stop processing jobs.
+	 * QUIT: Shutdown after the current job finishes processing.
+	 */
+	private function registerSigHandlers()
+	{
+		if(!function_exists('pcntl_signal')) {
+			return;
+		}
 
-        pcntl_signal(SIGTERM, array($this, 'shutdown'));
-        pcntl_signal(SIGINT, array($this, 'shutdown'));
-        pcntl_signal(SIGQUIT, array($this, 'shutdown'));
-    }
+		pcntl_signal(SIGTERM, array($this, 'shutdown'));
+		pcntl_signal(SIGINT, array($this, 'shutdown'));
+		pcntl_signal(SIGQUIT, array($this, 'shutdown'));
+	}
 
-    public function shutdown()
-    {
-        $this->shutdown = true;
-    }
+	public function shutdown()
+	{
+		$this->shutdown = true;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(ticks = 1);
+declare(ticks=1);
 
 /**
  * ResqueScheduler worker to handle scheduling of delayed tasks.
@@ -48,7 +48,7 @@ 
 		$this->registerSigHandlers();
 
         while (true) {
-            if($this->shutdown) {
+            if ($this->shutdown) {
                 break;
             }
 			$this->handleDelayedItems();
@@ -84,7 +84,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'],
@@ -116,7 +116,7 @@ 
 	 */
 	private function updateProcLine($status)
 	{
-		if(function_exists('setproctitle')) {
+		if (function_exists('setproctitle')) {
 			setproctitle('resque-scheduler-' . ResqueScheduler::VERSION . ': ' . $status);
 		}
 	}
@@ -128,10 +128,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");
 		}
 	}
@@ -145,7 +145,7 @@ 
      */
     private function registerSigHandlers()
     {
-        if(!function_exists('pcntl_signal')) {
+        if (!function_exists('pcntl_signal')) {
             return;
         }