From 9cb0413463a160ef3983b18b8088fd782b3b05e9 Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Fri, 21 Nov 2008 09:50:32 +0000
Subject: [PATCH] The log level set in the configuration settings will now override the level in the ktlog.ini for the rootLogger. All other log levels will still be set in the ktlog.ini.

---
 config/dmsDefaults.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php
index 4338822..ecbf690 100644
--- a/config/dmsDefaults.php
+++ b/config/dmsDefaults.php
@@ -157,6 +157,11 @@ class KTInit {
         $logDir = $oKTConfig->get('urls/logDirectory');
         $properties['log4php.appender.default.file'] = $logDir . '/kt%s.' . KTUtil::running_user() .  '.log.txt';
 
+        // get the log level set in the configuration settings to override the level set in ktlog.ini
+        // for the default / main logging. Additional logging can be configured through the ini file
+        $logLevel = $oKTConfig->get('KnowledgeTree/logLevel');
+        $properties['log4php.rootLogger'] = $logLevel . ', default';
+
         session_start();
         $configurator->doConfigureProperties($properties, $repository);
 
@@ -422,7 +427,8 @@ class KTInit {
 
         $oKTConfig->setdefaultns('KnowledgeTree', 'fileSystemRoot', KT_DIR);
         $oKTConfig->setdefaultns('KnowledgeTree', 'serverName', KTUtil::arrayGet($_SERVER, 'HTTP_HOST', 'localhost'));
-        $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'false');
+
+        // Set ssl to enabled if using https - if the server variable is not set, allow the config setting to take precedence
         if (array_key_exists('HTTPS', $_SERVER)) {
             if (strtolower($_SERVER['HTTPS']) === 'on') {
                 $oKTConfig->setdefaultns('KnowledgeTree', 'sslEnabled', 'true');
--
libgit2 0.21.4