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 65ae2a53b6596730e9f4b107e95c7dffdf001c04..449f92d1275e8f24e6b371b163afcdac496b22ff 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -10,15 +10,16 @@
 use Friendica\App;
 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);
 }
@@ -64,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);
@@ -113,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');
 
@@ -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();
        }