Issue 13052: The limit parameter now behaves like the Mastodon counterpart

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index 6237df49de1aee6266eac8289d8cf361ea60f088..e550aea891ed157adad7b585019598a68dab80b5 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -65,9 +65,6 @@ $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']])
 DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 
-// Check the database structure and possibly fixes it
-Update::check(DI::basePath(), true, DI::mode());
-
 if (DI::mode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
 }
@@ -79,8 +76,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
@@ -196,6 +193,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;
@@ -247,5 +247,6 @@ while (true) {
 }
 
 function shutdown() {
+       posix_kill(posix_getpid(), SIGTERM);
        posix_kill(posix_getpid(), SIGHUP);
 }