diff --git a/bin/daemon.php b/bin/daemon.php index 06a97d74ca..ac04915dad 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -32,4 +32,4 @@ $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "daemon"); $container = \Friendica\Core\Container::fromDice($dice); -\Friendica\Core\Console::create($container, $_SERVER['argv'] ?? [])->execute(); +\Friendica\Core\Console::create($container, $argv)->execute(); diff --git a/bin/jetstream.php b/bin/jetstream.php index 7c9447a59e..b38c934563 100755 --- a/bin/jetstream.php +++ b/bin/jetstream.php @@ -27,4 +27,4 @@ $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "jetstream"); $container = \Friendica\Core\Container::fromDice($dice); -\Friendica\Core\Console::create($container, $_SERVER['argv'] ?? [])->execute(); +\Friendica\Core\Console::create($container, $argv)->execute(); diff --git a/bin/worker.php b/bin/worker.php index 4efc614d63..d27b4014a0 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -29,4 +29,4 @@ $argv = $_SERVER['argv'] ?? []; array_splice($argv, 1, 0, "worker"); $container = \Friendica\Core\Container::fromDice($dice); -\Friendica\Core\Console::create($container, $_SERVER['argv'] ?? [])->execute(); +\Friendica\Core\Console::create($container, $argv)->execute(); diff --git a/src/Console/Daemon.php b/src/Console/Daemon.php index 3838c80ada..e2d9eeabef 100644 --- a/src/Console/Daemon.php +++ b/src/Console/Daemon.php @@ -93,7 +93,7 @@ HELP; protected function doExecute() { - if ($this->executable !== 'bin/console.php') { + if (substr($this->executable,-strlen('bin/console.php')) !== 'bin/console.php') { $this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php daemon' instead", $this->executable)); } @@ -101,8 +101,6 @@ HELP; throw new RuntimeException("Friendica isn't properly installed yet"); } - $this->logger->warning('blah!'); - $this->mode->setExecutor(Mode::DAEMON); $this->config->reload(); diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php index 3e1867a6e0..06f996fa7f 100644 --- a/src/Console/JetstreamDaemon.php +++ b/src/Console/JetstreamDaemon.php @@ -24,7 +24,7 @@ use RuntimeException; */ final class JetstreamDaemon extends AbstractConsole { - public const LOG_CHANNEL = LogChannel::AUTH_JABBERED; + public const LOG_CHANNEL = LogChannel::DAEMON; private Mode $mode; private IManageConfigValues $config;