Fixed E_NOTICE when no valid result has been returned. (#5457)

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index 1abb70146207e9c1d53b99756244068b055adb5f..449f92d1275e8f24e6b371b163afcdac496b22ff 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -8,18 +8,18 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 
 // 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);
 }
@@ -28,18 +28,21 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
-require_once ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
+if ($a->isInstallMode()) {
+       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('Please set system.pidfile in config/local.ini.php. For example:'."\n".
+               '[system]'."\n".
+               'pidfile = /path/to/daemon.pid'."\n");
 }
 
+$pidfile = Config::get('system', 'pidfile');
+
 if (in_array("start", $_SERVER["argv"])) {
        $mode = "start";
 }
@@ -62,7 +65,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);
@@ -111,7 +118,7 @@ if (!$foreground) {
        // fclose(STDOUT); // file descriptors as we
        // fclose(STDERR); // are running as a daemon.
 
-       dba::disconnect();
+       DBA::disconnect();
 
        register_shutdown_function('shutdown');
 
@@ -127,11 +134,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
@@ -154,7 +159,7 @@ 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();
        }