Bugfixing Monolog

- Default Loglevel for logs set to 'info'
- Default config level is set to 'notice'
- using 'notice' for auth-failures
- Bugfixing wrong usage of legacy 'log()'

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 16fb13862823bb72281bf9e5476e839a861ab950..c44ccc968f33ede8092d9fee49539cd23ba66850 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -84,7 +84,7 @@ class Logger extends BaseObject
                }
 
                if (is_int($loglevel)) {
-                       $loglevel = self::mapLegacyConfigDebugLevel($loglevel);
+                       $loglevel = self::mapLegacyDebugLevel($loglevel);
                }
 
                LoggerFactory::addStreamHandler($logger, $logfile, $loglevel);
@@ -111,7 +111,7 @@ class Logger extends BaseObject
         *
         * @return string the PSR-3 compliant level
         */
-       private static function mapLegacyConfigDebugLevel($level)
+       private static function mapLegacyDebugLevel($level)
        {
                switch ($level) {
                        // legacy WARNING
@@ -319,23 +319,25 @@ class Logger extends BaseObject
                self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
-       /**
-        * @brief      Logs the given message at the given log level
-        *
-        * @param string $msg
-        * @param string $level
+    /**
+     * @brief Logs the given message at the given log level
+     *
+     * @param string $msg
+     * @param int    $level
         *
         * @throws \Exception
         * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
-        */
-    public static function log($msg, $level = LogLevel::NOTICE)
+     */
+    public static function log($msg, $level = 3)
     {
                if (!isset(self::$logger)) {
                        return;
                }
 
+               $loglevel = self::mapLegacyDebugLevel($level);
+
         $stamp1 = microtime(true);
-               self::$logger->log($level, $msg);
+               self::$logger->log($loglevel, $msg);
         self::getApp()->saveTimestamp($stamp1, "file");
     }
 

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 06af508e9b777bc45d2bf81380d4ea1767b85292..516a05df565758085b606fb0a17ed006396b6358 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -148,7 +148,7 @@ class Login extends BaseModule
                                );
                        }
                } catch (Exception $e) {
-                       Logger::log('authenticate: failed login attempt: ' . Strings::escapeTags($username) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
+                       Logger::notice('authenticate: failed login attempt', ['username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
                        info('Login failed. Please check your credentials.' . EOL);
                        $a->internalRedirect();
                }