X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=c7b321c11c3c455ab8d31fc61b48b30ee68a0ebc;hb=21f9d8fcc9ad3db40a33cdd9a46cd6328824ef2a;hp=f7dcce1642800ba74730f6b05f0f19a805f2b562;hpb=41d1f0173ad65b225415a5aacb4a640c05908254;p=friendica.git

diff --git a/bin/daemon.php b/bin/daemon.php
index f7dcce1642..c7b321c11c 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -8,38 +8,53 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Util\LoggerFactory;
+
+// Get options
+$shortopts = 'f';
+$longopts = ['foreground'];
+$options = getopt($shortopts, $longopts);
 
 // Ensure that daemon.php is executed from the base path of the installation
 if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 	$directory = dirname($_SERVER["argv"][0]);
 
 	if (substr($directory, 0, 1) != "/") {
-		$directory = $_SERVER["PWD"]."/".$directory;
+		$directory = $_SERVER["PWD"] . "/" . $directory;
 	}
-	$directory = realpath($directory."/..");
+	$directory = realpath($directory . "/..");
 
 	chdir($directory);
 }
 
-require_once "boot.php";
-require_once "include/dba.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$logger = LoggerFactory::create('daemon');
 
-$a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
+$a = new App(dirname(__DIR__), $logger);
 
-require_once ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
+if ($a->getMode()->isInstall()) {
+	die("Friendica isn't properly installed yet.\n");
+}
 
 Config::load();
 
-if (!isset($pidfile)) {
-	die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".
-		'$pidfile = "/path/to/daemon.pid";'."\n");
+if (empty(Config::get('system', 'pidfile'))) {
+	die(<<<TXT
+Please set system.pidfile in config/local.config.php. For example:
+    
+    'system' => [ 
+        'pidfile' => '/path/to/daemon.pid',
+    ],
+TXT
+    );
 }
 
+$pidfile = Config::get('system', 'pidfile');
+
 if (in_array("start", $_SERVER["argv"])) {
 	$mode = "start";
 }
@@ -52,7 +67,7 @@ if (in_array("status", $_SERVER["argv"])) {
 	$mode = "status";
 }
 
-$foreground = in_array("--foreground", $_SERVER["argv"]);
+$foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options);
 
 if (!isset($mode)) {
 	die("Please use either 'start', 'stop' or 'status'.\n");
@@ -62,7 +77,11 @@ if (empty($_SERVER["argv"][0])) {
 	die("Unexpected script behaviour. This message should never occur.\n");
 }
 
-$pid = @file_get_contents($pidfile);
+$pid = null;
+
+if (is_readable($pidfile)) {
+	$pid = intval(file_get_contents($pidfile));
+}
 
 if (empty($pid) && in_array($mode, ["stop", "status"])) {
 	Config::set('system', 'worker_daemon_mode', false);
@@ -85,7 +104,7 @@ if ($mode == "stop") {
 
 	unlink($pidfile);
 
-	logger("Worker daemon process $pid was killed.", LOGGER_DEBUG);
+	$logger->notice("Worker daemon process was killed", ["pid" => $pid]);
 
 	Config::set('system', 'worker_daemon_mode', false);
 	die("Worker daemon process $pid was killed.\n");
@@ -95,7 +114,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
 	die("Daemon process $pid is already running.\n");
 }
 
-logger('Starting worker daemon.', LOGGER_DEBUG);
+$logger->notice('Starting worker daemon.', ["pid" => $pid]);
 
 if (!$foreground) {
 	echo "Starting worker daemon.\n";
@@ -106,10 +125,12 @@ if (!$foreground) {
 	}
 
 	fclose(STDIN);  // Close all of the standard
-	fclose(STDOUT); // file descriptors as we
-	fclose(STDERR); // are running as a daemon.
 
-	dba::disconnect();
+	// Enabling this seem to block a running php process with 100% CPU usage when there is an outpout
+	// fclose(STDOUT); // file descriptors as we
+	// fclose(STDERR); // are running as a daemon.
+
+	DBA::disconnect();
 
 	register_shutdown_function('shutdown');
 
@@ -125,11 +146,9 @@ if (!$foreground) {
 	file_put_contents($pidfile, $pid);
 
 	// We lose the database connection upon forking
-	dba::connect($db_host, $db_user, $db_pass, $db_data);
+	$a->loadDatabase();
 }
 
-unset($db_host, $db_user, $db_pass, $db_data);
-
 Config::set('system', 'worker_daemon_mode', true);
 
 // Just to be sure that this script really runs endlessly
@@ -143,7 +162,7 @@ $last_cron = 0;
 // Now running as a daemon.
 while (true) {
 	if (!$do_cron && ($last_cron + $wait_interval) < time()) {
-		logger('Forcing cron worker call.', LOGGER_DEBUG);
+		$logger->info('Forcing cron worker call.', ["pid" => $pid]);
 		$do_cron = true;
 	}
 
@@ -152,12 +171,12 @@ while (true) {
 	if ($do_cron) {
 		// We force a reconnect of the database connection.
 		// This is done to ensure that the connection don't get lost over time.
-		dba::reconnect();
+		DBA::reconnect();
 
 		$last_cron = time();
 	}
 
-	logger("Sleeping", LOGGER_DEBUG);
+	$logger->info("Sleeping", ["pid" => $pid]);
 	$start = time();
 	do {
 		$seconds = (time() - $start);
@@ -174,10 +193,10 @@ while (true) {
 
 	if ($timeout) {
 		$do_cron = true;
-		logger("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
+		$logger->info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
 	} else {
 		$do_cron = false;
-		logger("Worker jobs are calling to be forked.", LOGGER_DEBUG);
+		$logger->info("Worker jobs are calling to be forked.", ["pid" => $pid]);
 	}
 }