fixed loop bug in db query log

Author: samuraee

README.md

@@ -5,12 +5,12 @@ XLog adds `User ID`, `User IP`, `Track ID` to each log
 ## Installation
 
 ```bash
-composer require tartan/laravel-xlog
+composer require php-monsters/laravel-xlog
 ```
 
 Add this to your app service providers :
 ```php
-    Tartan\Log\XLogServiceProvider::class,
+    PhpMonsters\Log\XLogServiceProvider::class,
 ```
 
 ## Config (optional)
@@ -26,7 +26,7 @@ XLOG_TRACK_ID_KEY= (default xTrackId)
 ## Usage
 
 ```php
-use Tartan\Log\XLog; // or register XLog Facade
+use PhpMonsters\Log\XLog; // or register XLog Facade
 
 XLog::debug('test message');
 XLog::info('test message');

composer.json

@@ -1,28 +1,38 @@
 {
-    "name": "tartan/laravel-xlog",
+    "name": "php-monsters/laravel-xlog",
     "description": "extended Laravel 5+ log",
     "keywords": ["laravel", "log", "xlog", "extended logger", "laravel log"],
     "type": "laravel-component",
     "license": "MIT",
     "authors": [
         {
-            "name": "Aboozar Ghaffari <Tartan>",
+            "name": "Aboozar Ghaffari <@samuraee>",
             "email": "[email protected]"
         }
     ],
     "autoload": {
         "psr-4": {
-            "Tartan\\Log\\": "src"
+            "PhpMonsters\\Log\\": "src"
         },
         "files": [
             "src/helper.php"
         ]
     },
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.0",
         "illuminate/support": ">=5.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "PhpMonsters\\Log\\XLogServiceProvider"
+            ],
+            "aliases": {
+                "XLog": "PhpMonsters\\Log\\Facade"
+            }
+        }
     }
 }

src/Facades/XLog.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tartan\Log\Facades;
+namespace PhpMonsters\Log\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
 /**
  * Class XLog
- * @package Tartan\XLog
+ * @package PhpMonsters\XLog
  * @author  Aboozar Ghaffari <[email protected]>
  */
 class XLog extends Facade
@@ -18,6 +18,6 @@ class XLog extends Facade
      */
     protected static function getFacadeAccessor ()
     {
-        return 'Tartan\Log\Logger';
+        return 'PhpMonsters\Log\Logger';
     }
 }

src/Logger.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Tartan\Log;
+namespace PhpMonsters\Log;
 
-use Illuminate\Support\Facades\Auth;
 use Exception;
+use Illuminate\Support\Facades\Auth;
 
 class Logger
 {
@@ -13,20 +13,63 @@ class Logger
     private static $LOG_LEVELS = ['debug', 'info', 'notice', 'warning', 'error', 'critical', 'alert', 'emergency'];
 
     /**
-     * @param $name
-     * @param $arguments
-     *
+     * @var string
+     */
+    private static $userUserId = null;
+
+    /**
+     * @var bool
+     */
+    private static $firstCall = false;
+
+    /**
+     * @param Exception $e
+     * @param bool $trace log trace string or not
+     * @param string $name
      * @return mixed
      */
-    public function __call($name, $arguments)
+    public static function exception(Exception $e, bool $trace = false, string $name = 'error')
     {
-        if (!in_array($name, self::$LOG_LEVELS)) {
-            $name = 'debug';
+        $arguments = [];
+        $arguments [0] = 'exception-> ' . $e->getMessage();
+        $arguments [1] = [
+            'code' => $e->getCode(),
+            'file' => basename($e->getFile()),
+            'line' => $e->getLine(),
+            self::getTrackIdKey() => self::getTrackId(),
+        ];
+
+        if ($trace) {
+            $arguments[1]['trace'] = $e->getTraceAsString();
         }
 
         return self::__callStatic($name, $arguments);
     }
 
+    /**
+     * @return string
+     */
+    public static function getTrackIdKey(): string
+    {
+        return env('XLOG_TRACK_ID_KEY', 'xTrackId');
+    }
+
+    /**
+     * @return string
+     */
+    protected static function getTrackId(): string
+    {
+        $trackIdKey = self::getTrackIdKey();
+
+        try {
+            $trackId = resolve($trackIdKey);
+        } catch (Exception $e) {
+            $trackId = '-';
+        }
+
+        return $trackId;
+    }
+
     /**
      * @param $name
      * @param $arguments
@@ -48,28 +91,19 @@ public static function __callStatic($name, $arguments)
             $arguments[1] = [];
         }
 
-        if(!is_array($arguments[1])){
+        if (!is_array($arguments[1])) {
             $arguments[1] = [$arguments[1]];
         }
 
-        if (session_status() == PHP_SESSION_NONE) {
-            $arguments[1]['sid'] = session_id();
-        } else {
-            $arguments[1]['sid'] = '';
-        }
+        $arguments[1]['sid'] = self::getSessionId();
 
         $arguments[1]['uip'] = @clientIp();
 
         // add user id to all logs
-        if (env('XLOG_ADD_USERID', true)) {
-            if (!Auth::guest()) {
-                $arguments[1]['uid'] = 'us' . Auth::user()->id . 'er'; // user id as a tag
-            }
-        }
-        $trackIdKey = env('XLOG_TRACK_ID_KEY', 'xTrackId');
+        $arguments[1]['uid'] = self::getUserTag(); // user id as a tag
 
         // get request track ID from service container
-
+        $trackIdKey = self::getTrackIdKey();
         if (!isset($arguments[1][$trackIdKey])) {
             $arguments[1][$trackIdKey] = self::getTrackId($trackIdKey);
         }
@@ -78,49 +112,47 @@ public static function __callStatic($name, $arguments)
     }
 
     /**
-     * @param Exception $e
-     * @param string $level
-     *
-     * @return mixed
+     * @return string
      */
-    public static function exception(Exception $e, $name = 'error')
+    private static function getSessionId(): string
     {
-        $arguments     = [];
-        $arguments [0] = 'exception-> ' . $e->getMessage();
-        $arguments [1] = [
-            'code'                => $e->getCode(),
-            'file'                => basename($e->getFile()),
-            'line'                => $e->getLine(),
-            self::getTrackIdKey() => self::getTrackId(),
-        ];
-
-        return self::__callStatic($name, $arguments);
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            return session_id();
+        }
+        return '';
     }
 
     /**
      * @return string
      */
-    public static function getTrackIdKey()
+    private static function getUserTag(): string
     {
-        return env('XLOG_TRACK_ID_KEY', 'xTrackId');
+        // add user id to all logs
+        if ((bool)env('XLOG_ADD_USERID', true) === false || Auth::guest() === true) {
+            return 'user';
+        }
+
+        if (self::$firstCall === true) {
+            return 'us' . self::$userUserId . 'er';
+        }
+
+        self::$firstCall = true;
+        self::$userUserId = Auth::user()->id;
+        return 'us' . self::$userUserId . 'er';
     }
 
     /**
-     * @param $trackIdKey
+     * @param $name
+     * @param $arguments
      *
-     * @return string
+     * @return mixed
      */
-    protected static function getTrackId()
+    public function __call($name, $arguments)
     {
-        $trackIdKey = self::getTrackIdKey();
-
-        try {
-            $trackId = resolve($trackIdKey);
-        } catch (Exception $e) {
-            $trackId = '-';
+        if (!in_array($name, self::$LOG_LEVELS)) {
+            $name = 'debug';
         }
 
-        return $trackId;
+        return self::__callStatic($name, $arguments);
     }
-
 }

src/XLogServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tartan\Log;
+namespace PhpMonsters\Log;
 
 use Illuminate\Support\ServiceProvider;