From: Philipp <admin@philipp.info>
Date: Fri, 11 Sep 2020 17:24:40 +0000 (+0200)
Subject: Rename class for PSR-0
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=31c55a6fa45f0acd8ef9ff1ef86224778d614819;p=friendica.git

Rename class for PSR-0
---

diff --git a/src/Util/PidFile.php b/src/Util/PidFile.php
new file mode 100644
index 0000000000..6d4c0c5108
--- /dev/null
+++ b/src/Util/PidFile.php
@@ -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
index 6d4c0c5108..0000000000
--- a/src/Util/Pidfile.php
+++ /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
index 0000000000..00559f7508
--- /dev/null
+++ b/src/Worker/CleanWorkerQueue.php
@@ -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
index 00559f7508..0000000000
--- a/src/Worker/CleanWorkerqueue.php
+++ /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);
-			}
-		}
-	}
-}