Configure output for all commands

Author: murrant

app/Console/Commands/ConfigListCommand.php

@@ -25,7 +25,6 @@ public function __construct()
      */
     public function handle(): int
     {
-        $this->configureOutputOptions();
         $search = $this->argument('search') ?? '';
 
         $settings = (new DynamicConfig)->all()

app/Console/Commands/DeviceAdd.php

@@ -79,8 +79,6 @@ public function __construct()
      */
     public function handle(): int
     {
-        $this->configureOutputOptions();
-
         $this->validate([
             'port' => 'numeric|between:1,65535',
             'poller-group' => ['numeric', Rule::in(PollerGroup::pluck('id')->prepend(0))],

app/Console/Commands/DeviceDiscover.php

@@ -55,8 +55,6 @@ public function __construct()
 
     public function handle(MeasurementManager $measurements): int
     {
-        $this->configureOutputOptions();
-
         try {
             $this->handleDebug();
 

app/Console/Commands/DevicePing.php

@@ -34,7 +34,6 @@ public function __construct()
      */
     public function handle(DeviceIsPingable $deviceIsPingable): int
     {
-        $this->configureOutputOptions();
         $spec = $this->argument('device spec');
 
         if ($spec == 'fast') {

app/Console/Commands/DevicePoll.php

@@ -43,8 +43,6 @@ public function handle(MeasurementManager $measurements): int
             return $this->dispatchWork();
         }
 
-        $this->configureOutputOptions();
-
         if ($this->option('no-data')) {
             LibrenmsConfig::set('rrd.enable', false);
             LibrenmsConfig::set('influxdb.enable', false);

app/Console/Commands/MaintenanceRrdStep.php

@@ -28,8 +28,6 @@ public function __construct()
 
     public function handle(RrdProcess $rrdProcess): int
     {
-        $this->configureOutputOptions();
-
         $this->systemStep = (int) LibrenmsConfig::get('rrd.step', 300);
         $this->icmpStep = (int) LibrenmsConfig::get('ping_rrd_step', $this->systemStep);
         $this->systemHeartbeat = (int) LibrenmsConfig::get('rrd.heartbeat', $this->systemStep * 2);

app/Console/Commands/PortTune.php

@@ -25,8 +25,6 @@ public function __construct()
      */
     public function handle(): int
     {
-        $this->configureOutputOptions();
-
         $port_spec = $this->getPortSpec();
 
         $devices = Device::whereDeviceSpec($this->argument('device spec'))->get();

app/Console/Commands/SnmpFetch.php

@@ -41,8 +41,6 @@ public function __construct()
      */
     public function handle(): int
     {
-        $this->configureOutputOptions();
-
         $this->validate([
             'output' => ['nullable', Rule::in(['value', 'values', 'table', 'index-table'])],
         ]);

app/Console/LnmsCommand.php

@@ -29,9 +29,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
-use LibreNMS\Util\Debug;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
-use Symfony\Component\Console\Output\OutputInterface;
 use Validator;
 
 abstract class LnmsCommand extends Command
@@ -164,27 +162,6 @@ protected function validate(array $rules, array $messages = []): array
         }
     }
 
-    protected function configureOutputOptions(): void
-    {
-        $verbosity = $this->getOutput()->getVerbosity();
-
-        if ($verbosity === OutputInterface::VERBOSITY_QUIET) {
-            \Log::setDefaultDriver('stack'); // this omits stdout
-            Debug::setCliQuietOutput();
-
-            return;
-        }
-
-        \Log::setDefaultDriver('console');
-
-        if ($verbosity >= OutputInterface::VERBOSITY_VERY_VERBOSE) {
-            Debug::set();
-            if ($verbosity >= OutputInterface::VERBOSITY_DEBUG) {
-                Debug::setVerbose();
-            }
-        }
-    }
-
     protected function validatePromptInput(string $attributeName, string|array $rules): callable
     {
         return function (string|array $value) use ($attributeName, $rules): ?string {

app/Listeners/CommandStartingListener.php

@@ -28,6 +28,9 @@
 
 use App\Exceptions\RunningAsIncorrectUserException;
 use Illuminate\Console\Events\CommandStarting;
+use Illuminate\Support\Facades\Log;
+use LibreNMS\Util\Debug;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class CommandStartingListener
 {
@@ -39,6 +42,33 @@ class CommandStartingListener
      * @throws RunningAsIncorrectUserException
      */
     public function handle(CommandStarting $event): void
+    {
+        $this->configureOutput($event);
+        $this->checkRunningUser($event);
+    }
+
+    private function configureOutput(CommandStarting $event): void
+    {
+        $verbosity = $event->output->getVerbosity();
+
+        if ($verbosity === OutputInterface::VERBOSITY_QUIET) {
+            Log::setDefaultDriver('stack'); // this omits stdout
+            Debug::setCliQuietOutput();
+
+            return;
+        }
+
+        Log::setDefaultDriver('console');
+
+        if ($verbosity >= OutputInterface::VERBOSITY_VERY_VERBOSE) {
+            Debug::set();
+            if ($verbosity >= OutputInterface::VERBOSITY_DEBUG) {
+                Debug::setVerbose();
+            }
+        }
+    }
+
+    private function checkRunningUser(CommandStarting $event): void
     {
         // Check that we don't run this as the wrong user and break the install
         if (in_array($event->command, $this->skip_user_check)) {