Merge pull request #6457 from annando/onepoll-bug

[friendica.git] / src / Model / Process.php

diff --git a/src/Model/Process.php b/src/Model/Process.php
index 8b7ce8d34ae80ee3b9536494a9e9e25502594e14..4d50ecd4ebc180b7f4993d3e223fb43b685e9f90 100644 (file)
--- a/src/Model/Process.php
+++ b/src/Model/Process.php
@@ -5,10 +5,8 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use dba;
-
-require_once 'include/dba.php';
-require_once 'include/datetime.php';
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * @brief functions for interacting with a process
@@ -30,13 +28,13 @@ class Process extends BaseObject
                        $pid = getmypid();
                }
 
-               dba::transaction();
+               DBA::transaction();
 
-               if (!dba::exists('process', ['pid' => $pid])) {
-                       $return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => datetime_convert()]);
+               if (!DBA::exists('process', ['pid' => $pid])) {
+                       $return = DBA::insert('process', ['pid' => $pid, 'command' => $command, 'created' => DateTimeFormat::utcNow()]);
                }
 
-               dba::commit();
+               DBA::commit();
 
                return $return;
        }
@@ -53,7 +51,7 @@ class Process extends BaseObject
                        $pid = getmypid();
                }
 
-               return dba::delete('process', ['pid' => $pid]);
+               return DBA::delete('process', ['pid' => $pid]);
        }
 
        /**
@@ -61,15 +59,15 @@ class Process extends BaseObject
         */
        public static function deleteInactive()
        {
-               dba::transaction();
+               DBA::transaction();
 
-               $processes = dba::select('process', ['pid']);
-               while($process = dba::fetch($processes)) {
+               $processes = DBA::select('process', ['pid']);
+               while($process = DBA::fetch($processes)) {
                        if (!posix_kill($process['pid'], 0)) {
                                self::deleteByPid($process['pid']);
                        }
                }
 
-               dba::commit();
+               DBA::commit();
        }
 }