Merge pull request #8939 from MrPetovan/task/8906-frio-viewas-redesign

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

diff --git a/src/Model/Process.php b/src/Model/Process.php
index a960777129813f25a83254b1a758ae46bfb1bda9..18b5f785a1a619ede1c4609904ff3a83cfbd52dd 100644 (file)
--- a/src/Model/Process.php
+++ b/src/Model/Process.php
@@ -1,19 +1,33 @@
 <?php
 /**
- * @file src/Model/Process.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
-namespace Friendica\Model;
 
-use Friendica\BaseObject;
-use dba;
+namespace Friendica\Model;
 
-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
+ * functions for interacting with a process
  */
-class Process extends BaseObject
+class Process
 {
        /**
         * Insert a new process row. If the pid parameter is omitted, we use the current pid
@@ -21,18 +35,23 @@ class Process extends BaseObject
         * @param string $command
         * @param string $pid
         * @return bool
+        * @throws \Exception
         */
        public static function insert($command, $pid = null)
        {
                $return = true;
 
-               dba::transaction();
+               if (is_null($pid)) {
+                       $pid = getmypid();
+               }
+
+               DBA::transaction();
 
-               if (!dba::exists('process', ['pid' => getmypid()])) {
-                       $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;
        }
@@ -42,6 +61,7 @@ class Process extends BaseObject
         *
         * @param string $pid
         * @return bool
+        * @throws \Exception
         */
        public static function deleteByPid($pid = null)
        {
@@ -49,7 +69,7 @@ class Process extends BaseObject
                        $pid = getmypid();
                }
 
-               return dba::delete('process', ['pid' => $pid]);
+               return DBA::delete('process', ['pid' => $pid]);
        }
 
        /**
@@ -57,15 +77,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::close($processes);
+               DBA::commit();
        }
 }