3.1.10

easy-swoole · Jan 15, 2019 · 99c410f · 99c410f
1 parent 5f9b6aa
commit 99c410f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/Logger.php b/src/Logger.php
@@ -45,9 +45,6 @@ public function console(string $str, $category = null, $saveLog = true):?string
     {
         // TODO: Implement console() method.
         $str = $this->logger->console($str,$category,$saveLog);
-        if(Config::getInstance()->getConf('CONSOLE.PUSH_LOG')){
-            ConsoleService::push($str);
-        }
         return $str;
     }
 

diff --git a/src/SysConst.php b/src/SysConst.php
@@ -11,7 +11,7 @@
 
 class SysConst
 {
-    const EASYSWOOLE_VERSION = '3.1.9';
+    const EASYSWOOLE_VERSION = '3.1.10';
     const LOGGER_HANDLER = 'LOGGER_HANDLER';
     const ERROR_HANDLER = 'ERROR_HANDLER';
     const TRIGGER_HANDLER = 'TRIGGER_HANDLER';

diff --git a/src/Trigger.php b/src/Trigger.php
@@ -26,6 +26,9 @@ function __construct(TriggerInterface $trigger)
     public function error($msg, int $errorCode = E_USER_ERROR, Location $location = null)
     {
         // TODO: Implement error() method.
+        if($location == null){
+            $location = $this->getLocation();
+        }
         $this->trigger->error($msg,$errorCode,$location);
     }
 
@@ -34,4 +37,15 @@ public function throwable(\Throwable $throwable)
         // TODO: Implement throwable() method.
         $this->trigger->throwable($throwable);
     }
+
+    private function getLocation():Location
+    {
+        $location = new Location();
+        $debugTrace = debug_backtrace();
+        array_shift($debugTrace);
+        $caller = array_shift($debugTrace);
+        $location->setLine($caller['line']);
+        $location->setFile($caller['file']);
+        return $location;
+    }
 }