Changeset 374 for trunk

Timestamp:

06/25/10 14:15:07 (11 years ago)

Author:

sander

Message:

Automatically disable jobs after a certain number of failures

Location:

trunk/server/www/app

Files:

• config/core.php.default (modified) (1 diff)
• config/sql/schema.php (modified) (2 diffs)
• controllers/jobs_controller.php (modified) (1 diff)

trunk/server/www/app/config/core.php.default

@@ -279 +279 @@
                 Configure::write('Job.locktime', (5 * 60));
         }
+/**
+ * The number of times a job is allowed to fail before it will not run again
+ */
+        Configure:write('Job.maxfailures', 5);
 /**
  * The number of seconds since the last poll of a factory before it is dropped from the front page.

trunk/server/www/app/config/sql/schema.php

@@ -1 +1 @@
 <?php 
 /* SVN FILE: $Id$ */
-/* App schema generated on: 2010-06-08 12:06:45 : 1275992085*/
+/* App schema generated on: 2010-06-25 14:06:50 : 1277467250*/
 class AppSchema extends CakeSchema {
         var $name = 'App';
@@ -111 +111 @@
                         'factory_id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36),
                         'state' => array('type' => 'integer', 'null' => false, 'default' => '1'),
+                        'failures' => array('type' => 'integer', 'null' => false, 'default' => '0'),
                         'locked' => array('type' => 'datetime', 'null' => false, 'default' => '0000-00-00 00:00:00'),
                         'created' => array('type' => 'datetime', 'null' => true, 'default' => NULL),

trunk/server/www/app/controllers/jobs_controller.php

@@ -521 +521 @@
                 }
 
+                // If a factory ID has been set, this job has been handed out earlier. Increase the failure count
+                if ($job['Job']['factory_id']) {
+                        $job['Job']['failures'] += 1;
+
+                        // If this job has failed too many times, change it's state and prompt the factory to poll again
+                        if ($job['Job']['failures'] > Configure::read('Job.maxfailures')) {
+                                $job['Job']['state'] = Job::STATE_FAILED;
+                                $this->Job->save($job);
+                                
+                                $this->log(sprintf("Job ID %s failed %s times. Stopping job.", $job['Job']['id'], Configure::read('Job.maxfailures')), LOG_DEBUG);
+                                return null;
+                        }
+                }
+
                 $job['Job']['locked'] = date('Y-m-d H:i:s', time() + Configure::read('Job.locktime'));
                 $job['Job']['factory_id'] = $factory['Factory']['id'];