Logger update

xtrime-ru · Jan 12, 2020 · a8997ed · a8997ed
1 parent d76d617
commit a8997ed
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -23,6 +23,7 @@ public function __construct(array $sessions)
             $config['connection_settings']['all']['proxy'] = '\Socket';
             $config['connection_settings']['all']['proxy_extra'] = [];
         }
+
         foreach ($sessions as &$session) {
             $session = $config;
         }

diff --git a/src/EventHandler.php b/src/EventHandler.php
@@ -3,7 +3,6 @@
 namespace TelegramApiServer;
 
 use danog\MadelineProto\CombinedEventHandler;
-use danog\MadelineProto\Logger;
 
 class EventHandler extends CombinedEventHandler
 {
@@ -12,26 +11,28 @@ class EventHandler extends CombinedEventHandler
 
     public static function addEventListener($clientId, callable $callback)
     {
-        Logger::log("Add event listener. ClientId: {$clientId}");
+        Logger::getInstance()->notice("Add event listener. ClientId: {$clientId}");
         static::$eventListeners[$clientId] = $callback;
     }
 
     public static function removeEventListener($clientId): void
     {
-        Logger::log("Removing listener: {$clientId}");
+        Logger::getInstance()->notice("Removing listener: {$clientId}");
         unset(static::$eventListeners[$clientId]);
-        if (!static::$eventListeners) {
+        $listenersCount = count(static::$eventListeners);
+        Logger::getInstance()->notice("Event listeners left: {$listenersCount}");
+        if ($listenersCount === 0) {
             static::$eventListeners = [];
         }
     }
 
     public function onAny($update, $sessionFile): void
     {
         $session = Client::getSessionName($sessionFile);
-        Logger::log("Got update from session: {$session}");
+        Logger::getInstance()->info("Received update from session: {$session}");
 
         foreach (static::$eventListeners as $clientId => $callback) {
-            Logger::log("Pass update to callback. ClientId: {$clientId}");
+            Logger::getInstance()->notice("Pass update to callback. ClientId: {$clientId}");
             $callback($update, $session);
         }
     }

diff --git a/src/Logger.php b/src/Logger.php
@@ -28,6 +28,8 @@
  */
 class Logger extends AbstractLogger
 {
+    private static ?Logger $instanse = null;
+
     private static array $levels = [
         LogLevel::DEBUG => 0,
         LogLevel::INFO => 1,
@@ -54,7 +56,22 @@ class Logger extends AbstractLogger
     private int $minLevelIndex;
     private array $formatter;
 
-    public function __construct(string $minLevel = LogLevel::WARNING, callable $formatter = null)
+    public static function getInstance(): Logger
+    {
+        if (!static::$instanse) {
+            $settings = Config::getInstance()->get('telegram');
+            MadelineProto\Logger::$default = null;
+            MadelineProto\Logger::constructorFromSettings($settings);
+
+            $conversionTable = array_flip(static::$madelineLevels);
+            $loggerLevel = $conversionTable[$settings['logger']['logger_level']];
+            static::$instanse = new static($loggerLevel);
+        }
+
+        return static::$instanse;
+    }
+
+    protected function __construct(string $minLevel = LogLevel::WARNING, callable $formatter = null)
     {
         if (null === $minLevel) {
             if (isset($_ENV['SHELL_VERBOSITY']) || isset($_SERVER['SHELL_VERBOSITY'])) {

diff --git a/src/Server.php b/src/Server.php
@@ -23,7 +23,7 @@ public function __construct(Client $client, array $options)
             $server = new Amp\Http\Server\Server(
                 $this->getServerAddresses(static::getConfig($options)),
                 static::getRouter($client),
-                new Logger(LogLevel::DEBUG),
+                Logger::getInstance(),
                 (new Amp\Http\Server\Options())
                     ->withCompression()
                     ->withBodySizeLimit(30*1024*1024)