use BufferHandler, adapt filebeat, no need for uid

chubbyphp · Feb 8, 2020 · 324e4a1 · 324e4a1
1 parent 2a17736
commit 324e4a1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/app/ServiceFactory/MonologServiceFactory.php b/app/ServiceFactory/MonologServiceFactory.php
@@ -5,9 +5,9 @@
 namespace App\ServiceFactory;
 
 use Monolog\Formatter\LogstashFormatter;
+use Monolog\Handler\BufferHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use Monolog\Processor\UidProcessor;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -22,18 +22,14 @@ public function __invoke(): array
             LoggerInterface::class => static function (ContainerInterface $container) {
                 $monolog = $container->get('monolog');
 
-                return new Logger(
-                    $monolog['name'],
-                    [
+                return new Logger($monolog['name'], [
+                    new BufferHandler(
                         (new StreamHandler(
                             $monolog['path'],
                             $monolog['level']
-                        ))->setFormatter(new LogstashFormatter('app')),
-                    ],
-                    [
-                        new UidProcessor(),
-                    ]
-                );
+                        ))->setFormatter(new LogstashFormatter('app'))
+                    ),
+                ]);
             },
             'logger' => static function (ContainerInterface $container) {
                 return $container->get(LoggerInterface::class);

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - ./docker/prod/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./:/var/www/html:ro
+      - ./var/log/dev:/var/log/application:ro
     depends_on:
       - elasticsearch
       - kibana
diff --git a/docker/prod/filebeat/filebeat.yml b/docker/prod/filebeat/filebeat.yml
@@ -14,7 +14,7 @@ filebeat.autodiscover:
           config:
             - type: log
               paths:
-                - /var/www/html/var/log/*/*.log
+                - /var/log/application/*.log
               json.keys_under_root: true
 
 processors:

diff --git a/tests/Unit/ServiceFactory/MonologServiceFactoryTest.php b/tests/Unit/ServiceFactory/MonologServiceFactoryTest.php
@@ -8,10 +8,10 @@
 use Chubbyphp\Mock\Call;
 use Chubbyphp\Mock\MockByCallsTrait;
 use Monolog\Formatter\LogstashFormatter;
+use Monolog\Handler\BufferHandler;
 use Monolog\Handler\Handler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use Monolog\Processor\UidProcessor;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
@@ -58,8 +58,16 @@ public function testLoggerInterface(): void
 
         self::assertCount(1, $handlers);
 
+        /** @var BufferHandler $bufferedHandler */
+        $bufferedHandler = array_shift($handlers);
+
+        self::assertInstanceOf(BufferHandler::class, $bufferedHandler);
+
+        $handlerReflectionProperty = new \ReflectionProperty($bufferedHandler, 'handler');
+        $handlerReflectionProperty->setAccessible(true);
+
         /** @var StreamHandler $streamHandler */
-        $streamHandler = array_shift($handlers);
+        $streamHandler = $handlerReflectionProperty->getValue($bufferedHandler);
 
         self::assertInstanceOf(StreamHandler::class, $streamHandler);
 
@@ -70,16 +78,6 @@ public function testLoggerInterface(): void
         $formatter = $streamHandler->getFormatter();
 
         self::assertInstanceOf(LogstashFormatter::class, $formatter);
-
-        /** @var array<int, callable> $processors */
-        $processors = $logger->getProcessors();
-
-        self::assertCount(1, $processors);
-
-        /** @var UidProcessor $uidProcessor */
-        $uidProcessor = array_shift($processors);
-
-        self::assertInstanceOf(UidProcessor::class, $uidProcessor);
     }
 
     public function testLogger(): void