fixed limit bug and added commands usage to docs

Signed-off-by: bota <[email protected]>

Author: SergiuBota1

config/autoload/cli.global.php

@@ -19,8 +19,8 @@
             "swoole:stop"         => StopCommand::class,
             "messenger:start"     => ConsumeMessagesCommand::class,
             "messenger:debug"     => DebugCommand::class,
-            "messenger:processed" => GetProcessedMessagesCommand::class,
-            "messenger:failed"    => GetFailedMessagesCommand::class,
+            "processed"           => GetProcessedMessagesCommand::class,
+            "failed"              => GetFailedMessagesCommand::class,
         ],
     ],
     FileLockerInterface::class => [

docs/book/v1/commands.md

@@ -0,0 +1,26 @@
+## Available commands and usage
+
+The commands available are:
+
+1. `GetFailedMessagesCommand.php` - returns logs with messages that failed to process (levelName:error)
+2. `GetProcessedMessagesCommand.php` - returns logs with messages that were successfully processed (levelName:info)
+
+Both commands are used to extract data that can be filtered by period from the log file. The commands can be run in two different ways:
+
+### CLI
+
+To run the commands via CLI, use the following syntax:
+
+`php bin/cli.php failed --start="yyy-mm-dd" --end="yyy-mm-dd" --limit=int`
+
+`php bin/cli.php processed --start="yyy-mm-dd" --end="yyy-mm-dd" --limit=int`
+
+### TCP message
+
+To use commands using TCP messages the following messages can be used:
+
+`echo "failed --start=yyy-mm-dd --end=yyy-mm-dd --limit=days" | socat - TCP:host:port`
+
+`echo "processed --start=yyy-mm-dd --end=yyy-mm-dd --limit=days" | socat - TCP:host:port`
+
+In both cases the flags are optional. Keep in mind if both `start` and `end` are set, `limit` will not be applied, it's only used when one of `start` or `end` is missing.

src/Swoole/Command/GetFailedMessagesCommand.php

@@ -50,22 +50,36 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $end   = $input->getOption('end');
         $limit = $input->getOption('limit');
 
-        if (! $end) {
-            $end = date('Y-m-d H:i:s');
-        } elseif (! preg_match('/\d{2}:\d{2}:\d{2}/', $end)) {
+        if ($start && !preg_match('/\d{2}:\d{2}:\d{2}/', $start)) {
+            $start .= ' 00:00:00';
+        }
+
+        if ($end && !preg_match('/\d{2}:\d{2}:\d{2}/', $end)) {
             $end .= ' 23:59:59';
         }
 
-        if ($limit && is_numeric($limit) && ! $start) {
-            $start = date('Y-m-d H:i:s', strtotime("-{$limit} days", strtotime($end)));
-        } elseif ($start && ! preg_match('/\d{2}:\d{2}:\d{2}/', $start)) {
-            $start .= ' 00:00:00';
+        if ($limit && is_numeric($limit)) {
+            if ($start && !$end) {
+                $end = date('Y-m-d H:i:s', strtotime("+{$limit} days", strtotime($start)));
+            } elseif (!$start && $end) {
+                $start = date('Y-m-d H:i:s', strtotime("-{$limit} days", strtotime($end)));
+            }
+        }
+
+        if (!$end) {
+            $end = date('Y-m-d H:i:s');
         }
 
         $startTimestamp = $start ? strtotime($start) : null;
         $endTimestamp   = $end ? strtotime($end) : null;
 
-        $logPath = 'log/queue-log.log';
+        $logPath = dirname(__DIR__, 3) . '/log/queue-log.log';
+
+        if (! file_exists($logPath)) {
+            $output->writeln("<error>Log file not found: $logPath</error>");
+            return Command::FAILURE;
+        }
+
         $lines   = file($logPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
         foreach ($lines as $line) {

src/Swoole/Command/GetProcessedMessagesCommand.php

@@ -50,22 +50,36 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $end   = $input->getOption('end');
         $limit = $input->getOption('limit');
 
-        if (! $end) {
-            $end = date('Y-m-d H:i:s');
-        } elseif (! preg_match('/\d{2}:\d{2}:\d{2}/', $end)) {
+        if ($start && !preg_match('/\d{2}:\d{2}:\d{2}/', $start)) {
+            $start .= ' 00:00:00';
+        }
+
+        if ($end && !preg_match('/\d{2}:\d{2}:\d{2}/', $end)) {
             $end .= ' 23:59:59';
         }
 
-        if ($limit && is_numeric($limit) && ! $start) {
-            $start = date('Y-m-d H:i:s', strtotime("-{$limit} days", strtotime($end)));
-        } elseif ($start && ! preg_match('/\d{2}:\d{2}:\d{2}/', $start)) {
-            $start .= ' 00:00:00';
+        if ($limit && is_numeric($limit)) {
+            if ($start && !$end) {
+                $end = date('Y-m-d H:i:s', strtotime("+{$limit} days", strtotime($start)));
+            } elseif (!$start && $end) {
+                $start = date('Y-m-d H:i:s', strtotime("-{$limit} days", strtotime($end)));
+            }
+        }
+
+        if (!$end) {
+            $end = date('Y-m-d H:i:s');
         }
 
         $startTimestamp = $start ? strtotime($start) : null;
         $endTimestamp   = $end ? strtotime($end) : null;
 
-        $logPath = 'log/queue-log.log';
+        $logPath = dirname(__DIR__, 3) . '/log/queue-log.log';
+
+        if (! file_exists($logPath)) {
+            $output->writeln("<error>Log file not found: $logPath</error>");
+            return Command::FAILURE;
+        }
+
         $lines   = file($logPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
         foreach ($lines as $line) {