Changeset 2394

Timestamp:

08/28/08 14:37:28 (4 months ago)

Author:

MattRead

Message:

Updating cron float handling, fixes #615, thanks ayunyan. Also fixing apccache expiry type, forcing it to int.

Location:

trunk/htdocs/system/classes

Files:

• apccache.php (modified) (1 diff)
• crontab.php (modified) (6 diffs)

trunk/htdocs/system/classes/apccache.php

@@ -101 +101 @@
             return null;
         }
-        apc_store( "$group:$name", $value, $expiry );
+        apc_store( "$group:$name", $value, intval($expiry) );
     }
 

trunk/htdocs/system/classes/crontab.php

@@ -17 +17 @@
     {
         // check if it's time to run crons, and if crons are already running.
-        $next_cron = doubleval( Options::get('next_cron') );
+        $next_cron = intval( Options::get('next_cron') );
         if ( ( $next_cron > time() )
             || ( Options::get('cron_running') && Options::get('cron_running') > microtime(true) )
@@ -25 +25 @@
         
         // cron_running will timeout in 10 minutes
+        // round cron_running to 4 decimals
         $run_time = microtime(true) + 600;
+        $run_time = sprintf("%.4f", $run_time); 
         Options::set('cron_running', $run_time);
         
@@ -44 +46 @@
             }
             
+            $time = time();
             $crons = DB::get_results(
                 'SELECT * FROM {crontab} WHERE start_time <= ? AND next_run <= ?',
-                array( time(), time() ),
+                array( $time, $time ),
                 'CronJob'
                 );
@@ -67 +70 @@
     function act_poll_cron()
     {
-        $time = $this->handler_vars['time'];
+        $time = doubleval($this->handler_vars['time']);
         if ( $time != Options::get('cron_running') ) {
             return;
@@ -75 +78 @@
         set_time_limit(600);
         
+        $time = time();
         $crons = DB::get_results(
             'SELECT * FROM {crontab} WHERE start_time <= ? AND next_run <= ?',
-            array( time(), time() ),
+            array( $time, $time ),
             'CronJob'
             );
@@ -88 +92 @@
         
         // set the next run time to the lowest next_run OR a max of one day.
+        // @todo next_cron should be the actuall next run time and update it when new crons are
+        // added instead of just maxing out at one day..
         $next_cron = DB::get_value( 'SELECT next_run FROM {crontab} ORDER BY next_run ASC LIMIT 1', array() );
         Options::set('next_cron', min( (int) $next_cron, time() + 86400 ) );