Peter M. Groen / knowledgetree

Commit 9cb0413463a160ef3983b18b8088fd782b3b05e9

Authored by Megan Watson
1 parent 5ca42071

The log level set in the configuration settings will now override the level in t… 

…he ktlog.ini for the rootLogger. All other log levels will still be set in the ktlog.ini.

Committed by: Megan Watson
Reviewed by: Donald Jackson



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9607 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
config/dmsDefaults.php
  View file @9cb0413
@@ -157,6 +157,11 @@ class KTInit { @@ -157,6 +157,11 @@ class KTInit {
157 $logDir = $oKTConfig->get('urls/logDirectory'); 157 $logDir = $oKTConfig->get('urls/logDirectory');
158 $properties['log4php.appender.default.file'] = $logDir . '/kt%s.' . KTUtil::running_user() . '.log.txt'; 158 $properties['log4php.appender.default.file'] = $logDir . '/kt%s.' . KTUtil::running_user() . '.log.txt';
159 159
  160 + // get the log level set in the configuration settings to override the level set in ktlog.ini
  161 + // for the default / main logging. Additional logging can be configured through the ini file
  162 + $logLevel = $oKTConfig->get('KnowledgeTree/logLevel');
  163 + $properties['log4php.rootLogger'] = $logLevel . ', default';
  164 +
160 session_start(); 165 session_start();
161 $configurator->doConfigureProperties($properties, $repository); 166 $configurator->doConfigureProperties($properties, $repository);
162 167
@@ -422,7 +427,8 @@ class KTInit { @@ -422,7 +427,8 @@ class KTInit {
422 427
423 $oKTConfig->setdefaultns('KnowledgeTree', 'fileSystemRoot', KT_DIR); 428 $oKTConfig->setdefaultns('KnowledgeTree', 'fileSystemRoot', KT_DIR);
424 $oKTConfig->setdefaultns('KnowledgeTree', 'serverName', KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'localhost')); 429 $oKTConfig->setdefaultns('KnowledgeTree', 'serverName', KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'localhost'));
425 - $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'false'); 430 +
  431 + // Set ssl to enabled if using https - if the server variable is not set, allow the config setting to take precedence
426 if (array_key_exists('HTTPS', $_SERVER)) { 432 if (array_key_exists('HTTPS', $_SERVER)) {
427 if (strtolower($_SERVER['HTTPS']) === 'on') { 433 if (strtolower($_SERVER['HTTPS']) === 'on') {
428 $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'true'); 434 $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'true');