Refactor datetime_convert into Temporal::convert

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index ee313bef01cc68ca0c60bdb7a466920fc53e8005..cb1877dbcc9eb989c43999afa8888bffab981e72 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -11,6 +11,8 @@ use Friendica\Database\DBM;
 use Friendica\Model\Process;
 use Friendica\Util\Lock;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
+
 use dba;
 
 require_once 'include/dba.php';
@@ -233,7 +235,7 @@ class Worker
 
                        if ($age > 1) {
                                $stamp = (float)microtime(true);
-                               dba::update('workerqueue', ['executed' => datetime_convert()], ['pid' => $mypid, 'done' => false]);
+                               dba::update('workerqueue', ['executed' => Temporal::convert()], ['pid' => $mypid, 'done' => false]);
                                self::$db_duration += (microtime(true) - $stamp);
                        }
 
@@ -243,7 +245,7 @@ class Worker
 
                        $stamp = (float)microtime(true);
                        if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-                               Config::set('system', 'last_poller_execution', datetime_convert());
+                               Config::set('system', 'last_poller_execution', Temporal::convert());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
 
@@ -276,7 +278,7 @@ class Worker
 
                        if ($age > 1) {
                                $stamp = (float)microtime(true);
-                               dba::update('workerqueue', ['executed' => datetime_convert()], ['pid' => $mypid, 'done' => false]);
+                               dba::update('workerqueue', ['executed' => Temporal::convert()], ['pid' => $mypid, 'done' => false]);
                                self::$db_duration += (microtime(true) - $stamp);
                        }
 
@@ -284,7 +286,7 @@ class Worker
 
                        $stamp = (float)microtime(true);
                        if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-                               Config::set('system', 'last_poller_execution', datetime_convert());
+                               Config::set('system', 'last_poller_execution', Temporal::convert());
                        }
                        self::$db_duration = (microtime(true) - $stamp);
                } else {
@@ -572,7 +574,7 @@ class Worker
                                        }
                                        dba::update(
                                                'workerqueue',
-                                               ['executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => $new_priority, 'pid' => 0],
+                                               ['executed' => NULL_DATE, 'created' => Temporal::convert(), 'priority' => $new_priority, 'pid' => 0],
                                                ['id' => $entry["id"]]
                                        );
                                } else {
@@ -823,7 +825,7 @@ class Worker
                if ($found) {
                        $condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
                        array_unshift($ids, $condition);
-                       dba::update('workerqueue', ['executed' => datetime_convert(), 'pid' => $mypid], $ids);
+                       dba::update('workerqueue', ['executed' => Temporal::convert(), 'pid' => $mypid], $ids);
                }
 
                return $found;
@@ -951,7 +953,7 @@ class Worker
 
                /// @todo We should clean up the corresponding workerqueue entries as well
                $condition = ["`created` < ? AND `command` = 'worker.php'",
-                               datetime_convert('UTC', 'UTC', "now - ".$timeout." minutes")];
+                               Temporal::convert("now - ".$timeout." minutes")];
                dba::delete('process', $condition);
        }
 
@@ -1038,7 +1040,7 @@ class Worker
 
                $priority = PRIORITY_MEDIUM;
                $dont_fork = Config::get("system", "worker_dont_fork");
-               $created = datetime_convert();
+               $created = Temporal::convert();
 
                if (is_int($run_parameter)) {
                        $priority = $run_parameter;