Small fixes

avto-dev · Apr 11, 2019 · 2a2d832 · 2a2d832
1 parent c16e61f
commit 2a2d832
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 32 deletions.
diff --git a/src/Logging/DefaultLogstashLogger.php b/src/Logging/DefaultLogstashLogger.php
@@ -13,21 +13,17 @@
 
 class DefaultLogstashLogger implements LoggerContract
 {
+    use Traits\AppNameTrait;
+
     /**
      * {@inheritdoc}
      *
      * @throws Exception
      */
     public function __invoke(array $config): Logger
     {
-        try {
-            $app_name = config()->get('app.name');
-        } catch (\Throwable $e) {
-            //
-        }
-
         $formatter = new DefaultLogstashFormatter(
-            $config['formatter']['app_name'] ?? $app_name ?? 'app',
+            $config['formatter']['app_name'] ?? $this->getAppName() ?? 'app',
             $config['formatter']['system_name'] ?? null,
             $config['formatter']['extra_prefix'] ?? false,
             $config['formatter']['context_prefix'] ?? null,

diff --git a/src/Logging/DefaultUdpLogstashLogger.php b/src/Logging/DefaultUdpLogstashLogger.php
@@ -13,6 +13,8 @@
 
 class DefaultUdpLogstashLogger implements LoggerContract
 {
+    use Traits\AppNameTrait;
+
     /**
      * {@inheritdoc}
      *
@@ -21,17 +23,11 @@ class DefaultUdpLogstashLogger implements LoggerContract
     public function __invoke(array $config): Logger
     {
         if (! isset($config['host'], $config['port'])) {
-            throw new InvalidArgumentException('[host] and [port] values is required for this logger');
-        }
-
-        try {
-            $app_name = config()->get('app.name');
-        } catch (\Throwable $e) {
-            //
+            throw new InvalidArgumentException('[host] and [port] values are required for this logger');
         }
 
         $formatter = new DefaultLogstashFormatter(
-            $config['formatter']['app_name'] ?? $app_name ?? 'app',
+            $config['formatter']['app_name'] ?? $this->getAppName() ?? 'app',
             $config['formatter']['system_name'] ?? null,
             $config['formatter']['extra_prefix'] ?? false,
             $config['formatter']['context_prefix'] ?? null,

diff --git a/src/Logging/EventsLogstashLogger.php b/src/Logging/EventsLogstashLogger.php
@@ -13,21 +13,17 @@
 
 class EventsLogstashLogger implements LoggerContract
 {
+    use Traits\AppNameTrait;
+
     /**
      * {@inheritdoc}
      *
      * @throws Exception
      */
     public function __invoke(array $config): Logger
     {
-        try {
-            $app_name = config()->get('app.name');
-        } catch (\Throwable $e) {
-            //
-        }
-
         $formatter = new EventsLogstashFormatter(
-            $config['formatter']['app_name'] ?? $app_name ?? 'app',
+            $config['formatter']['app_name'] ?? $this->getAppName() ?? 'app',
             $config['formatter']['system_name'] ?? null,
             $config['formatter']['extra_prefix'] ?? false,
             $config['formatter']['context_prefix'] ?? null,

diff --git a/src/Logging/EventsUdpLogstashLogger.php b/src/Logging/EventsUdpLogstashLogger.php
@@ -13,6 +13,8 @@
 
 class EventsUdpLogstashLogger implements LoggerContract
 {
+    use Traits\AppNameTrait;
+
     /**
      * {@inheritdoc}
      *
@@ -21,17 +23,11 @@ class EventsUdpLogstashLogger implements LoggerContract
     public function __invoke(array $config): Logger
     {
         if (! isset($config['host'], $config['port'])) {
-            throw new InvalidArgumentException('[host] and [port] values is required for this logger');
-        }
-
-        try {
-            $app_name = config()->get('app.name');
-        } catch (\Throwable $e) {
-            //
+            throw new InvalidArgumentException('[host] and [port] values are required for this logger');
         }
 
         $formatter = new EventsLogstashFormatter(
-            $config['formatter']['app_name'] ?? $app_name ?? 'app',
+            $config['formatter']['app_name'] ?? $this->getAppName() ?? 'app',
             $config['formatter']['system_name'] ?? null,
             $config['formatter']['extra_prefix'] ?? false,
             $config['formatter']['context_prefix'] ?? null,

diff --git a/src/Logging/Handlers/UdpHandler.php b/src/Logging/Handlers/UdpHandler.php
@@ -104,8 +104,8 @@ public function close(): void
      */
     public function recordToString(array $record): string
     {
-        if (isset($record['formatted']) && \is_string($record['formatted'])) {
-            return $record['formatted'];
+        if (isset($record['formatted']) && \is_string($formatted = $record['formatted'])) {
+            return $formatted;
         }
 
         return 'ERROR: FORMATTER NOT SET';

diff --git a/src/Logging/Traits/AppNameTrait.php b/src/Logging/Traits/AppNameTrait.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace AvtoDev\EventsLogLaravel\Logging\Traits;
+
+trait AppNameTrait
+{
+    /**
+     * Get application name.
+     *
+     * @return string|null
+     */
+    protected function getAppName(): ?string
+    {
+        try {
+            return config()->get('app.name');
+        } catch (\Throwable $e) {
+            //
+        }
+
+        return null;
+    }
+}