Skip to content

Commit

Permalink
Fixup LogChannels
Browse files Browse the repository at this point in the history
  • Loading branch information
nupplaphil committed Jan 5, 2025
1 parent 5b0ab3e commit 9756176
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bin/daemon.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
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();
2 changes: 1 addition & 1 deletion bin/jetstream.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
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();
2 changes: 1 addition & 1 deletion bin/worker.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
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();
4 changes: 1 addition & 3 deletions src/Console/Daemon.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,14 @@ protected function getHelp(): string

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));
}

if ($this->mode->isInstall()) {
throw new RuntimeException("Friendica isn't properly installed yet");
}

$this->logger->warning('blah!');

$this->mode->setExecutor(Mode::DAEMON);

$this->config->reload();
Expand Down
2 changes: 1 addition & 1 deletion src/Console/JetstreamDaemon.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
final class JetstreamDaemon extends AbstractConsole
{
public const LOG_CHANNEL = LogChannel::AUTH_JABBERED;
public const LOG_CHANNEL = LogChannel::DAEMON;

private Mode $mode;
private IManageConfigValues $config;
Expand Down

0 comments on commit 9756176

Please sign in to comment.