Changeset 364 for dev/mods/ajcron

Timestamp:

12/16/08 23:26:06 (14 years ago)

Author:

exi

Message:

First working version of ajcron, see  http://eve-id.net/forum/viewtopic.php?f=505&t=13513 for details

Location:

dev/mods/ajcron

Files:

• auto_settings.php (modified) (1 diff)
• init.php (modified) (2 diffs)

dev/mods/ajcron/auto_settings.php

@@ -8 +8 @@
 options::fadd('Reset next scheduled run to now', 'ajcron_resetNextRun', 'checkbox');
 options::fadd('Reset running jobs', 'ajcron_resetRunning', 'checkbox');
+options::fadd('Blocking Cronjobs', 'ajcron_blocking', 'checkbox');
 options::fadd('Next scheduled run', 'none', 'custom', array('ajcron', 'getNextRunDisplay'), array('ajcron', 'resetNextRunCheckbox'));
-options::fadd('Jobs', 'ajcron_jobs', 'textarea:cols:60');
+options::fadd('Jobs', 'ajcron_jobs', 'textarea:cols:60:rows:10');
+options::fadd('Runtable', 'anone', 'custom', array('ajcron', 'getRuntable'));

dev/mods/ajcron/init.php

@@ -31 +31 @@
     {
         $page->addBody('<script type="text/javascript" charset="UTF-8">
-            var myLocalCallback = xajax.callback.create(400, 1000);
+            var myLocalCallback = xajax.callback.create(4000, 10000);
             myLocalCallback.onExpiration = function(req) { xajax.abortRequest(req); }
             xajax.call(\'xajax_req\', {callback: myLocalCallback});</script>');
@@ -105 +105 @@
         foreach ($arr as $job)
         {
+            if (!trim($job))
+            {
+                continue;
+            }
             $tmp = preg_split("/".chr(32)."/", trim($job), -1, PREG_SPLIT_NO_EMPTY);
-            $nextrun = date('Y-m-d H:i:s' ,ajcron::getNextRun($tmp[0]));
+            $nextrun = ajcron::getNextRun($tmp[0]);
             $jobs[$i++] = array('id' => md5(trim($job)), 'nextrun' => $nextrun, 'name' => $tmp[2],  'url' => $tmp[1]);
         }
 
-        return nl2br(var_export($jobs, true));
+        return $jobs;
+    }
+
+    function getRuntable()
+    {
+        $output = '';
+        // load up our crontasks
+        $jobs = ajcron::parseJobs();
+        $state = config::get('ajcron_running');
+
+        foreach ($jobs as $job)
+        {
+            if (isset($state[$job['id']]))
+            {
+                $running = 'running';
+            }
+            else
+            {
+                $running = 'not running';
+            }
+
+            if (empty($job['name']))
+            {
+                $name = '-None found-';
+            }
+            else
+            {
+                $name = $job['name'];
+            }
+            $output .= '<b>Name:</b> '.$name.' <b>URL:</b> '.$job['url'].' <b>Nextrun:</b> '.date('Y-m-d H:i:s', $job['nextrun']).'<br/>';
+            $output .= '&nbsp;&nbsp;&nbsp;<b>State:</b> '.$running.' <b>ID: </b>'.$job['id'].'<br/><br/>';
+        }
+
+        return $output;
+    }
+
+    function getNextRuntime()
+    {
+        // calculate and set new runtime
+        $jobs = ajcron::parseJobs();
+        $sorttable = array();
+        // see which one should be started now
+        foreach ($jobs as $job)
+        {
+            $sorttable[$job['id']] = $job['nextrun'];
+        }
+        asort($sorttable);
+        config::set('ajcron_nextrun', $sorttable[key($sorttable)]);
     }
 
     function xajax_req()
     {
+        // if the xajax call gets aborted, ignore that
         @ignore_user_abort(true);
         @set_time_limit(0);
-        // actual code goes here
+
+        $state = config::get('ajcron_running');
+        if (!is_array($state))
+        {
+            $state = array();
+            config::set('ajcron_running', $state);
+        }
+
+        // check for blocking
+        if (config::get('ajcron_blocking'))
+        {
+            // if there is already something running, give up
+            if (count($state) >= 1)
+            {
+                return;
+            }
+        }
 
         // load up our crontasks
         $jobs = ajcron::parseJobs();
 
+        // if there are no jobs just quit
         if (!count($jobs))
         {
             return;
         }
-        $nextrun = $jobs[0]['nextrun'];
-        $id = null;
+
         // see which one should be started now
-        foreach ($jobs as $job)
-        {
-            if ($nextrun > $job['nextrun'])
-            {
-                $nextrun = $job['nextrun'];
-                $id = $job['id'];
-            }
-        }
-
-        // start
-        #include_once('common/includes/class.http.php');
-        #$http = new http_request($fetchurl);
-        #$http->set_timeout(120);
-        #$data = $http->get_content();
-
-        // calculate and set new runtime
-        #config::set('ajcron_nextrun', time());
+        $sorttable = array();
+        foreach ($jobs as $job)
+        {
+            $sorttable[$job['id']] = $job['nextrun'];
+        }
+        asort($sorttable);
+
+        foreach ($sorttable as $id => $nextrun)
+        {
+            // this bypasses already running jobs
+            if (isset($state[$id]))
+            {
+                continue;
+            }
+            break;
+        }
+
+        if (!$id)
+        {
+            // no id found we could run as all are running
+            return;
+        }
+
+        // set current id to running
+        $state[$id] = 'running';
+        $currentJob = null;
+        config::set('ajcron_running', $state);
+        foreach ($jobs as $job)
+        {
+            if ($job['id'] == $id)
+            {
+                $currentJob = $job;
+            }
+        }
+
+        // run the job (finally)
+        include_once('common/includes/class.http.php');
+        $http = new http_request($currentJob['url']);
+        $http->set_timeout(120);
+        $data = $http->get_content();
+
+        // job done, clean up
+        // we need to refresh our variable to prevent overwriting of
+        // other running jobs
+        $db = new DBQuery(true);
+        $db->execute('select * from kb3_config where cfg_site=\''.KB_SITE.'\' and cfg_key=\'ajcron_running\'');
+        $row = $db->getRow();
+        $state = unserialize($row['cfg_value']);
+        unset($state[$id]);
+        config::set('ajcron_running', $state);
+
+        // calculate when next to insert ajax
+        ajcron::getNextRuntime();
 
         // testfun!
         $objResponse = new xajaxResponse();
-        $objResponse->Assign("header", "innerHTML", ajcron::parseJobs());
+        #$objResponse->Assign("header", "innerHTML", nl2br(var_export($sorttable[key($sorttable)], true)));
         #sleep(15);
         return $objResponse;