]> git.mxchange.org Git - friendica.git/commitdiff
Rename class for PSR-0
authorPhilipp <admin@philipp.info>
Fri, 11 Sep 2020 17:24:40 +0000 (19:24 +0200)
committerPhilipp <admin@philipp.info>
Fri, 11 Sep 2020 17:24:40 +0000 (19:24 +0200)
src/Util/PidFile.php [new file with mode: 0644]
src/Util/Pidfile.php [deleted file]
src/Worker/CleanWorkerQueue.php [new file with mode: 0644]
src/Worker/CleanWorkerqueue.php [deleted file]

diff --git a/src/Util/PidFile.php b/src/Util/PidFile.php
new file mode 100644 (file)
index 0000000..6d4c0c5
--- /dev/null
@@ -0,0 +1,125 @@
+<?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\Util;
+
+/**
+ * Pidfile class
+ */
+class PidFile
+{
+       /**
+        * Read the pid from a given pid file
+        *
+        * @param string $file Filename of pid file
+        *
+        * @return boolean|string PID or "false" if not existent
+        */
+       static private function pidFromFile($file) {
+               if (!file_exists($file)) {
+                       return false;
+               }
+
+               return trim(@file_get_contents($file));
+       }
+
+       /**
+        * Is there a running process with the given pid file
+        *
+        * @param string $file Filename of pid file
+        *
+        * @return boolean Is it running?
+        */
+       static public function isRunningProcess($file) {
+               $pid = self::pidFromFile($file);
+
+               if (!$pid) {
+                       return false;
+               }
+
+               // Is the process running?
+               $running = posix_kill($pid, 0);
+
+               // If not, then we will kill the stale file
+               if (!$running) {
+                       self::delete($file);
+               }
+               return $running;
+       }
+
+       /**
+        * Kills a process from a given pid file
+        *
+        * @param string $file Filename of pid file
+        *
+        * @return boolean Was it killed successfully?
+        */
+       static public function killProcess($file) {
+               $pid = self::pidFromFile($file);
+
+               // We don't have a process id? then we quit
+               if (!$pid) {
+                       return false;
+               }
+
+               // We now kill the process
+               $killed = posix_kill($pid, SIGTERM);
+
+               // If we killed the process successfully, we can remove the pidfile
+               if ($killed) {
+                       self::delete($file);
+               }
+               return $killed;
+       }
+
+       /**
+        * Creates a pid file
+        *
+        * @param string $file Filename of pid file
+        *
+        * @return boolean|string PID or "false" if not created
+        */
+       static public function create($file) {
+               $pid = self::pidFromFile($file);
+
+               // We have a process id? then we quit
+               if ($pid) {
+                       return false;
+               }
+
+               $pid = getmypid();
+               file_put_contents($file, $pid);
+
+               // Now we check if everything is okay
+               return self::pidFromFile($file);
+       }
+
+       /**
+        * Deletes a given pid file
+        *
+        * @param string $file Filename of pid file
+        *
+        * @return boolean Is it running?
+        */
+       static public function delete($file) {
+               return @unlink($file);
+       }
+}
diff --git a/src/Util/Pidfile.php b/src/Util/Pidfile.php
deleted file mode 100644 (file)
index 6d4c0c5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Util;
-
-/**
- * Pidfile class
- */
-class PidFile
-{
-       /**
-        * Read the pid from a given pid file
-        *
-        * @param string $file Filename of pid file
-        *
-        * @return boolean|string PID or "false" if not existent
-        */
-       static private function pidFromFile($file) {
-               if (!file_exists($file)) {
-                       return false;
-               }
-
-               return trim(@file_get_contents($file));
-       }
-
-       /**
-        * Is there a running process with the given pid file
-        *
-        * @param string $file Filename of pid file
-        *
-        * @return boolean Is it running?
-        */
-       static public function isRunningProcess($file) {
-               $pid = self::pidFromFile($file);
-
-               if (!$pid) {
-                       return false;
-               }
-
-               // Is the process running?
-               $running = posix_kill($pid, 0);
-
-               // If not, then we will kill the stale file
-               if (!$running) {
-                       self::delete($file);
-               }
-               return $running;
-       }
-
-       /**
-        * Kills a process from a given pid file
-        *
-        * @param string $file Filename of pid file
-        *
-        * @return boolean Was it killed successfully?
-        */
-       static public function killProcess($file) {
-               $pid = self::pidFromFile($file);
-
-               // We don't have a process id? then we quit
-               if (!$pid) {
-                       return false;
-               }
-
-               // We now kill the process
-               $killed = posix_kill($pid, SIGTERM);
-
-               // If we killed the process successfully, we can remove the pidfile
-               if ($killed) {
-                       self::delete($file);
-               }
-               return $killed;
-       }
-
-       /**
-        * Creates a pid file
-        *
-        * @param string $file Filename of pid file
-        *
-        * @return boolean|string PID or "false" if not created
-        */
-       static public function create($file) {
-               $pid = self::pidFromFile($file);
-
-               // We have a process id? then we quit
-               if ($pid) {
-                       return false;
-               }
-
-               $pid = getmypid();
-               file_put_contents($file, $pid);
-
-               // Now we check if everything is okay
-               return self::pidFromFile($file);
-       }
-
-       /**
-        * Deletes a given pid file
-        *
-        * @param string $file Filename of pid file
-        *
-        * @return boolean Is it running?
-        */
-       static public function delete($file) {
-               return @unlink($file);
-       }
-}
diff --git a/src/Worker/CleanWorkerQueue.php b/src/Worker/CleanWorkerQueue.php
new file mode 100644 (file)
index 0000000..00559f7
--- /dev/null
@@ -0,0 +1,50 @@
+<?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\Worker;
+
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\DI;
+
+/**
+ * Delete all done workerqueue entries
+ */
+class CleanWorkerQueue
+{
+       public static function execute()
+       {
+               DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
+
+               // Optimizing this table only last seconds
+               if (DI::config()->get('system', 'optimize_tables')) {
+                       // We are acquiring the two locks from the worker to avoid locking problems
+                       if (DI::lock()->acquire(Worker::LOCK_PROCESS, 10)) {
+                               if (DI::lock()->acquire(Worker::LOCK_WORKER, 10)) {
+                                       DBA::e("OPTIMIZE TABLE `workerqueue`");
+                                       DBA::e("OPTIMIZE TABLE `process`");                     
+                                       DI::lock()->release(Worker::LOCK_WORKER);
+                               }
+                               DI::lock()->release(Worker::LOCK_PROCESS);
+                       }
+               }
+       }
+}
diff --git a/src/Worker/CleanWorkerqueue.php b/src/Worker/CleanWorkerqueue.php
deleted file mode 100644 (file)
index 00559f7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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\Worker;
-
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-
-/**
- * Delete all done workerqueue entries
- */
-class CleanWorkerQueue
-{
-       public static function execute()
-       {
-               DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
-
-               // Optimizing this table only last seconds
-               if (DI::config()->get('system', 'optimize_tables')) {
-                       // We are acquiring the two locks from the worker to avoid locking problems
-                       if (DI::lock()->acquire(Worker::LOCK_PROCESS, 10)) {
-                               if (DI::lock()->acquire(Worker::LOCK_WORKER, 10)) {
-                                       DBA::e("OPTIMIZE TABLE `workerqueue`");
-                                       DBA::e("OPTIMIZE TABLE `process`");                     
-                                       DI::lock()->release(Worker::LOCK_WORKER);
-                               }
-                               DI::lock()->release(Worker::LOCK_PROCESS);
-                       }
-               }
-       }
-}