feat: log ES requests to specific channel

jorge07 · May 27, 2020 · 6409c51 · 6409c51
1 parent b19c711
commit 6409c51
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/config/packages/dev/monolog.yaml b/config/packages/dev/monolog.yaml
@@ -1,10 +1,16 @@
 monolog:
+    channels: ['elasticsearch']
     handlers:
+        elasticsearch:
+            type: stream
+            path: "%kernel.logs_dir%/elasticsearch_%kernel.environment%.log"
+            level: debug
+            channels: ["elasticsearch"]
         main:
             type: stream
             path: "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-            channels: ["!event"]
+            channels: ["!event", "!elasticsearch"]
         # uncomment to get logging in your browser
         # you may have to allow bigger header sizes in your Web server configuration
         #firephp:

diff --git a/src/Infrastructure/Share/Event/Query/EventElasticRepository.php b/src/Infrastructure/Share/Event/Query/EventElasticRepository.php
@@ -10,11 +10,9 @@
 
 final class EventElasticRepository extends ElasticRepository implements EventRepositoryInterface
 {
-    private const INDEX = 'events';
-
-    public function __construct(array $elasticConfig)
+    protected function index(): string
     {
-        parent::__construct($elasticConfig, self::INDEX);
+        return 'events';
     }
 
     public function store(DomainMessage $message): void

diff --git a/src/Infrastructure/Share/Query/Repository/ElasticRepository.php b/src/Infrastructure/Share/Query/Repository/ElasticRepository.php
@@ -7,40 +7,47 @@
 use Assert\Assertion;
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Psr\Log\LoggerInterface;
 
 abstract class ElasticRepository
 {
-    private string $index;
-
     private Client $client;
 
-    public function __construct(array $config, string $index)
+    public function __construct(array $elasticConfig, LoggerInterface $elasticsearchLogger = null)
     {
-        $this->client = ClientBuilder::fromConfig($config, true);
-        $this->index = $index;
+        $defaultConfig = [];
+
+        if ($elasticsearchLogger) {
+            $defaultConfig['logger'] = $elasticsearchLogger;
+            $defaultConfig['tracer'] = $elasticsearchLogger;
+        }
+
+        $this->client = ClientBuilder::fromConfig(\array_replace($defaultConfig, $elasticConfig), true);
     }
 
+    abstract protected function index(): string;
+
     public function search(array $query): array
     {
         $finalQuery = [];
 
-        $finalQuery['index'] = $this->index;
+        $finalQuery['index'] = $this->index();
         $finalQuery['body'] = $query;
 
         return $this->client->search($finalQuery);
     }
 
     public function refresh(): void
     {
-        if ($this->client->indices()->exists(['index' => $this->index])) {
-            $this->client->indices()->refresh(['index' => $this->index]);
+        if ($this->client->indices()->exists(['index' => $this->index()])) {
+            $this->client->indices()->refresh(['index' => $this->index()]);
         }
     }
 
     public function delete(): void
     {
-        if ($this->client->indices()->exists(['index' => $this->index])) {
-            $this->client->indices()->delete(['index' => $this->index]);
+        if ($this->client->indices()->exists(['index' => $this->index()])) {
+            $this->client->indices()->delete(['index' => $this->index()]);
         }
     }
 
@@ -52,16 +59,16 @@ public function reboot(): void
 
     public function boot(): void
     {
-        if (!$this->client->indices()->exists(['index' => $this->index])) {
-            $this->client->indices()->create(['index' => $this->index]);
+        if (!$this->client->indices()->exists(['index' => $this->index()])) {
+            $this->client->indices()->create(['index' => $this->index()]);
         }
     }
 
     protected function add(array $document): array
     {
         $query = [];
 
-        $query['index'] = $this->index;
+        $query['index'] = $this->index();
         $query['id'] = $document['id'] ?? null;
         $query['body'] = $document;
 
@@ -74,7 +81,7 @@ public function page(int $page = 1, int $limit = 50): array
 
         $query = [];
 
-        $query['index'] = $this->index;
+        $query['index'] = $this->index();
         $query['from'] = ($page - 1) * $limit;
         $query['size'] = $limit;