Commit 1f886d76 authored by haemmer's avatar haemmer
Browse files

Added new instance identifier config options

Logging now contains instance identifier
parent dba815c4
......@@ -214,7 +214,15 @@
// 5. Appearance Settings
// Name of the federation
// Identifier for this particular instance of the SWITCHwayf
// This is mainly used for logging to syslog and in particular
// useful in case multiple instances of the SWITCHwayf are
// operated on the same host
// $instanceIdentifier = 'SWITCHwayf';
// Name of the federation [deprecated]
// This value is not used anymore in the standard code.
// Please ensure it is not used anymore in templates
//$federationName = 'myFederation';
// URL to send user to when clicking on federation logo
......@@ -758,7 +758,14 @@ function logAccessEntry($protocol, $type, $sp, $idp, $return){
// Init connection to system logger
function initLogger(){
openlog("SWITCHwayf", LOG_NDELAY, LOG_USER);
global $instanceIdentifier;
$logIdentifier = 'SWITCHwayf';
if (isset($instanceIdentifier) && !empty($instanceIdentifier)){
$logIdentifier = $instanceIdentifier;
openlog($logIdentifier, LOG_NDELAY, LOG_USER);
......@@ -834,7 +841,6 @@ function isPartOfPathInfo($needle){
// Converts to the unified datastructure that the Shibboleth DS will be using
function convertToShibDSStructure($IDProviders){
global $federationName;
$ShibDSIDProviders = array();
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment