Fix lost local tags upon update

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index 577e884ebf333dba3d00fd707f6ff300f052e3e9..53a564b8bc15ff77099206ad0f56d166b934a610 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -33,6 +33,7 @@ if (php_sapi_name() !== 'cli') {
 use Dice\Dice;
 use Friendica\App\Mode;
 use Friendica\Core\Logger;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -59,11 +60,13 @@ if (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]);
 
 DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
-$a = DI::app();
 
 if (DI::mode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
@@ -76,8 +79,8 @@ DI::config()->reload();
 if (empty(DI::config()->get('system', 'pidfile'))) {
        die(<<<TXT
 Please set system.pidfile in config/local.config.php. For example:
-    
-    'system' => [ 
+
+    'system' => [
         'pidfile' => '/path/to/daemon.pid',
     ],
 TXT
@@ -160,9 +163,14 @@ if (!$foreground) {
                exit(1);
        } elseif ($pid) {
                // The parent process continues here
+               if (!file_put_contents($pidfile, $pid)) {
+                       echo "Pid file wasn't written.\n";
+                       Logger::warning('Could not store pid file');
+                       posix_kill($pid, SIGTERM);
+                       exit(1);
+               }
                echo 'Child process started with pid ' . $pid . ".\n";
                Logger::notice('Child process started', ['pid' => $pid]);
-               file_put_contents($pidfile, $pid);
                exit(0);
        }
 
@@ -193,6 +201,9 @@ $last_cron = 0;
 
 // Now running as a daemon.
 while (true) {
+       // Check the database structure and possibly fixes it
+       Update::check(DI::basePath(), true);
+
        if (!$do_cron && ($last_cron + $wait_interval) < time()) {
                Logger::info('Forcing cron worker call.', ['pid' => $pid]);
                $do_cron = true;
@@ -244,5 +255,6 @@ while (true) {
 }
 
 function shutdown() {
+       posix_kill(posix_getpid(), SIGTERM);
        posix_kill(posix_getpid(), SIGHUP);
 }