Fixup LogChannels

diff --git a/bin/daemon.php b/bin/daemon.php
index 06a97d74ca2d0e048ac4b2fb8c60c17dcb0e5ec0..ac04915dadb98ddfbfa2377dad901fd0660d06bf 100755 (executable)
--- 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 7c9447a59ef6ead955c1b1cd6bf9a5e9d97ea71a..b38c934563d8735aea053e179cd72cfef5b634e7 100755 (executable)
--- 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 4efc614d63d645126584de5c983d96f94bb9720e..d27b4014a0083d29e22bbbc9f461f83883325496 100755 (executable)
--- 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 3838c80adae069b3f10b6621090710792c7afcde..e2d9eeabefc3fabc1eb2e2d6e3d8655c92a33945 100644 (file)
--- 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 3e1867a6e0442072a9e0af22d1b1ba600be2cd6c..06f996fa7ffc016a5fde0f3710537a5e8e05e163 100644 (file)
--- 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;