From 4b43ef7973de64618f151f47ff11bf25c743e927 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Thu, 31 Mar 2016 16:03:29 +0200
Subject: [PATCH] Fix build. If we are logging to STDERR, we don't have to
write to the filesystem anyway, so why checking?
---
lib/SimpleSAML/Logger/LoggingHandlerFile.php | 4 ++--
lib/SimpleSAML/Logger/StandardError.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerFile.php b/lib/SimpleSAML/Logger/LoggingHandlerFile.php
index 72838fe30..77efe2244 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerFile.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerFile.php
@@ -32,8 +32,8 @@ class SimpleSAML_Logger_LoggingHandlerFile implements SimpleSAML_Logger_LoggingH
SimpleSAML\Logger::INFO => 'INFO',
SimpleSAML\Logger::DEBUG => 'DEBUG',
);
- private $processname = null;
- private $format;
+ protected $processname = null;
+ protected $format;
/**
diff --git a/lib/SimpleSAML/Logger/StandardError.php b/lib/SimpleSAML/Logger/StandardError.php
index 62eb8acc8..f6d07088c 100644
--- a/lib/SimpleSAML/Logger/StandardError.php
+++ b/lib/SimpleSAML/Logger/StandardError.php
@@ -18,7 +18,8 @@ class StandardError extends \SimpleSAML_Logger_LoggingHandlerFile
*/
public function __construct()
{
- parent::__construct();
+ $config = \SimpleSAML_Configuration::getInstance();
+ $this->processname = $config->getString('logging.processname', 'SimpleSAMLphp');
$this->logFile = 'php://stderr';
}
}
--
GitLab