From 13af37a440689e53f4adce42314f1858f827adda Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Thu, 31 Mar 2016 15:13:46 +0200
Subject: [PATCH] Allow passing as a parameter the logging handler to use in
 SimpleSAML\Logger::createLoggingHandler().

---
 lib/SimpleSAML/Logger.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/SimpleSAML/Logger.php b/lib/SimpleSAML/Logger.php
index 07a6fc494..76e328abb 100644
--- a/lib/SimpleSAML/Logger.php
+++ b/lib/SimpleSAML/Logger.php
@@ -340,7 +340,7 @@ class Logger
         }
     }
 
-    private static function createLoggingHandler()
+    private static function createLoggingHandler($handler = null)
     {
         // set to FALSE to indicate that it is being initialized
         self::$loggingHandler = false;
@@ -350,7 +350,9 @@ class Logger
         assert($config instanceof \SimpleSAML_Configuration);
 
         // get the metadata handler option from the configuration
-        $handler = $config->getString('logging.handler', 'syslog');
+        if (is_null($handler)) {
+            $handler = $config->getString('logging.handler', 'syslog');
+        }
 
         // setting minimum log_level
         self::$logLevel = $config->getInteger('logging.level', self::INFO);
-- 
GitLab