Peter M. Groen / knowledgetree

Commit 16c476d32f9864e8d0acd2987c9c1f60674237d4

Authored by megan_w
1 parent 093c3795

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/branches/RB_3.5.4a@9608 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
config/dmsDefaults.php
  View file @16c476d
... ... @@ -157,6 +157,11 @@ class KTInit {
157 157 $logDir = $oKTConfig->get('urls/logDirectory');
158 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 165 session_start();
161 166 $configurator->doConfigureProperties($properties, $repository);
162 167  
... ... @@ -422,7 +427,8 @@ class KTInit {
422 427  
423 428 $oKTConfig->setdefaultns('KnowledgeTree', 'fileSystemRoot', KT_DIR);
424 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 432 if (array_key_exists('HTTPS', $_SERVER)) {
427 433 if (strtolower($_SERVER['HTTPS']) === 'on') {
428 434 $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'true');
... ...