Catch HTTPExceptions in App::runFrontend()

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index f628031c351ae595d8b22c72392c56a02487683e..e60e32b19ec0900caf57450c0d7c09794d69d2d3 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -30,8 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
        chdir($directory);
 }
 
-require_once "boot.php";
-require_once "include/dba.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $a = new App(dirname(__DIR__));
 
@@ -42,9 +41,14 @@ if ($a->getMode()->isInstall()) {
 Config::load();
 
 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");
+       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');