From 5832b4ded69c730cb47284235b4f4a06a30c0804 Mon Sep 17 00:00:00 2001
From: Lasse Birnbaum Jensen <lasse@sdu.dk>
Date: Wed, 18 Jun 2008 07:46:36 +0000
Subject: [PATCH] Added options to configure processname for logging. Usefull
when having multiple installations on the same machine.
Processname in the log is determined by the 'logging.processname' configuration key. It defaults to "simpleSAMLphp" if not set.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@667 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/config.php | 2 +-
lib/SimpleSAML/Logger/LoggingHandlerErrorLog.php | 10 +++++++---
lib/SimpleSAML/Logger/LoggingHandlerFile.php | 8 +++++---
lib/SimpleSAML/Logger/LoggingHandlerSyslog.php | 5 +++--
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index 3b6399696..d6578f049 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -89,7 +89,7 @@ $config = array (
*/
'logging.level' => LOG_NOTICE,
'logging.handler' => 'syslog',
-
+ 'logging.processname' => 'simpleSAMLphp',
/* Logging: syslog - Choose a syslog facility to use for logging.
*/
'logging.facility' => LOG_LOCAL5,
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerErrorLog.php b/lib/SimpleSAML/Logger/LoggingHandlerErrorLog.php
index 5ae9ec220..0a9bddbff 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerErrorLog.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerErrorLog.php
@@ -23,17 +23,21 @@ class SimpleSAML_Logger_LoggingHandlerErrorLog implements SimpleSAML_Logger_Logg
LOG_NOTICE => 'NOTICE',
LOG_INFO => 'INFO',
LOG_DEBUG => 'DEBUG',
- );
+ );
- function log_internal($level, $string) {
+ function log_internal($level, $string) {
+ $config = SimpleSAML_Configuration::getInstance();
+ assert($config instanceof SimpleSAML_Configuration);
+ $processname = $config->getValue('logging.processname','simpleSAMLphp');
+
if(array_key_exists($level, self::$levelNames)) {
$levelName = self::$levelNames[$level];
} else {
$levelName = sprintf('UNKNOWN%d', $level);
}
- error_log($levelName . ': ' . $string);
+ error_log($processname.' - '.$levelName . ': ' . $string);
}
}
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerFile.php b/lib/SimpleSAML/Logger/LoggingHandlerFile.php
index c9e0b2828..d14381038 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerFile.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerFile.php
@@ -11,7 +11,8 @@
class SimpleSAML_Logger_LoggingHandlerFile implements SimpleSAML_Logger_LoggingHandler {
- private $logFile = null;
+ private $logFile = null;
+ private $processname = null;
function __construct() {
$config = SimpleSAML_Configuration::getInstance();
@@ -19,7 +20,8 @@ class SimpleSAML_Logger_LoggingHandlerFile implements SimpleSAML_Logger_LoggingH
/* Get the metadata handler option from the configuration. */
$this->logFile = $config->getPathValue('loggingdir').$config->getValue('logging.logfile');
-
+ $this->processname = $config->getValue('logging.processname','simpleSAMLphp');
+
if (@file_exists($this->logFile)) {
if (!@is_writeable($this->logFile)) throw new Exception("Could not write to logfile: ".$this->logFile);
}
@@ -31,7 +33,7 @@ class SimpleSAML_Logger_LoggingHandlerFile implements SimpleSAML_Logger_LoggingH
function log_internal($level,$string) {
if ($this->logFile != null) {
- $line = sprintf("%s ssp %d %s\n",strftime("%b %d %H:%M:%S"),$level,$string);
+ $line = sprintf("%s %s %d %s\n",strftime("%b %d %H:%M:%S"),$this->processname,$level,$string);
file_put_contents($this->logFile,$line,FILE_APPEND);
}
}
diff --git a/lib/SimpleSAML/Logger/LoggingHandlerSyslog.php b/lib/SimpleSAML/Logger/LoggingHandlerSyslog.php
index 86789ee24..9d92f979d 100644
--- a/lib/SimpleSAML/Logger/LoggingHandlerSyslog.php
+++ b/lib/SimpleSAML/Logger/LoggingHandlerSyslog.php
@@ -16,7 +16,8 @@ class SimpleSAML_Logger_LoggingHandlerSyslog implements SimpleSAML_Logger_Loggin
function __construct() {
$config = SimpleSAML_Configuration::getInstance();
assert($config instanceof SimpleSAML_Configuration);
- $facility = $config->getValue('logging.facility');
+ $facility = $config->getValue('logging.facility');
+ $processname = $config->getValue('logging.processname','simpleSAMLphp');
/*
* OS Check
* Setting facility to LOG_USER (only valid in Windows), enable log level rewrite on windows systems.
@@ -26,7 +27,7 @@ class SimpleSAML_Logger_LoggingHandlerSyslog implements SimpleSAML_Logger_Loggin
$facility = LOG_USER;
}
- openlog("simpleSAMLphp", LOG_PID, $facility);
+ openlog($processname, LOG_PID, $facility);
}
function log_internal($level,$string) {
--
GitLab