From 963b9837532fe28d2cbdfb94b315de6e55729d83 Mon Sep 17 00:00:00 2001 From: Mark Holtzhausen Date: Mon, 14 Dec 2009 11:42:14 +0200 Subject: [PATCH] SysLog db configuration updates. --- sql/mysql/install/data.sql | 9 ++++++--- sql/mysql/upgrade/3.7.0.3/clienttools_config.sql | 6 ++++++ sql/mysql/upgrade/3.7.0.3/data.sql | 6 ------ webservice/clienttools/clienttools_syslog.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- webservice/clienttools/comms.php | 1 + 5 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 sql/mysql/upgrade/3.7.0.3/clienttools_config.sql delete mode 100644 sql/mysql/upgrade/3.7.0.3/data.sql diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index 14e795e..bbb0673 100755 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -162,7 +162,8 @@ INSERT INTO `config_groups` VALUES (21, 'user_prefs', 'User Preferences', 'Configures user preferences.', 'General Settings'), (22, 'webservice', 'Web Services', 'KnowledgeTree Web Service Interface configuration. Note that a number of KnowledgeTree Tools rely on this service.', 'Client Tools Settings'), (23, 'ldapAuthentication', 'LDAP Authentication', 'Configures LDAP Authentication', 'General Settings'), -(24, 'server', 'Server Settings', 'Configuration settings for the server', 'General Settings'); +(24, 'server', 'Server Settings', 'Configuration settings for the server', 'General Settings'), +(25, 'explorerCPSettings', 'Explorer CP Settings', 'Configuration options for KnowledgeTree Explorer CP', 'Client Tools Settings'); /*!40000 ALTER TABLE `config_groups` ENABLE KEYS */; UNLOCK TABLES; @@ -291,7 +292,8 @@ INSERT INTO `config_settings` VALUES (116, 'export', 'Use External Zip Binary', 'Utilises the external zip binary for compressing archives. The default is to use the PEAR archive class.', 'useBinary', 'default', 'true', 'boolean', NULL, 0), (117, 'export', 'Use Bulk Download Queue', 'The bulk download can be large and can prevent normal browsing. The download queue performs the bulk downloads in the background.', 'useDownloadQueue', 'default', 'true', 'boolean', NULL, 1), (118, 'urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0), -(119, 'externalBinary', 'convert', 'The path to the ImageMagick "convert" binary', 'convertPath', 'default', 'convert', 'string', NULL, 1); +(119, 'externalBinary', 'convert', 'The path to the ImageMagick "convert" binary', 'convertPath', 'default', 'convert', 'string', NULL, 1), +(120, 'explorerCPSettings', 'Debug Log Level', 'Set the level of debug information included in the server side log file', 'debugLevel', 'error', 'error', 'dropdown', 'a:1:{s:7:\"options\";a:3:{i:0;a:2:{s:5:\"value\";s:3:\"off\";s:5:\"label\";s:10:\"No Logging\";}i:1;a:2:{s:5:\"value\";s:5:\"error\";s:5:\"label\";s:18:\"Error Logging Only\";}i:2;a:2:{s:5:\"value\";s:5:\"debug\";s:5:\"label\";s:28:\"Error and Debug Info Logging\";}}}', 1); /*!40000 ALTER TABLE `config_settings` ENABLE KEYS */; UNLOCK TABLES; @@ -1775,7 +1777,8 @@ INSERT INTO `upgrades` VALUES (231,'sql*3.7.0.1*0*3.7.0.1/mime_extractors_reset.sql','Database upgrade to version 3.7.0.1: Mime extractors reset','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), (232,'upgrade*3.7.0.1*99*upgrade3.7.0.1','Upgrade from version 3.6.3 to 3.7.0.1','2009-11-13 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), (233,'sql*3.7.0.2*0*3.7.0.2/processor_queue.sql','Database upgrade to version 3.7.0.1: Processor Queue','2009-09-01 00:00:00',1,'upgrade*3.7.0.2*99*upgrade3.7.0.2'), -(234,'upgrade*3.7.0.2*99*upgrade3.7.0.2','Upgrade from version 3.7.0.1 to 3.7.0.2','2009-11-19 00:00:00',1,'upgrade*3.7.0.2*99*upgrade3.7.0.2'); +(234,'upgrade*3.7.0.2*99*upgrade3.7.0.2','Upgrade from version 3.7.0.1 to 3.7.0.2','2009-11-19 00:00:00',1,'upgrade*3.7.0.2*99*upgrade3.7.0.2'), +(233,'sql*3.7.0.3*0*3.7.0.3/clienttools_config.sql','Database upgrade to version 3.7.0.3: Clienttools Config','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'); /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/mysql/upgrade/3.7.0.3/clienttools_config.sql b/sql/mysql/upgrade/3.7.0.3/clienttools_config.sql new file mode 100644 index 0000000..b3f5284 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0.3/clienttools_config.sql @@ -0,0 +1,6 @@ +# Configuration Settings for Explorer CP v0.9a server side logging. +INSERT INTO config_groups(`name`, `display_name`, `description`, `category`) +VALUES('explorerCPSettings', 'Explorer CP Settings', 'Configuration options for KnowledgeTree Explorer CP', 'Client Tools Settings'); + +INSERT INTO config_settings(`group_name`, `display_name`, `description`, `item`, `value`, `default_value`, `type`, `options`, `can_edit`) +VALUES('explorerCPSettings', 'Debug Log Level', 'Set the level of debug information included in the server side log file', 'debugLevel', 'error', 'error', 'dropdown', 'a:1:{s:7:\"options\";a:3:{i:0;a:2:{s:5:\"value\";s:3:\"off\";s:5:\"label\";s:10:\"No Logging\";}i:1;a:2:{s:5:\"value\";s:5:\"error\";s:5:\"label\";s:18:\"Error Logging Only\";}i:2;a:2:{s:5:\"value\";s:5:\"debug\";s:5:\"label\";s:28:\"Error and Debug Info Logging\";}}}', 1); diff --git a/sql/mysql/upgrade/3.7.0.3/data.sql b/sql/mysql/upgrade/3.7.0.3/data.sql deleted file mode 100644 index b3f5284..0000000 --- a/sql/mysql/upgrade/3.7.0.3/data.sql +++ /dev/null @@ -1,6 +0,0 @@ -# Configuration Settings for Explorer CP v0.9a server side logging. -INSERT INTO config_groups(`name`, `display_name`, `description`, `category`) -VALUES('explorerCPSettings', 'Explorer CP Settings', 'Configuration options for KnowledgeTree Explorer CP', 'Client Tools Settings'); - -INSERT INTO config_settings(`group_name`, `display_name`, `description`, `item`, `value`, `default_value`, `type`, `options`, `can_edit`) -VALUES('explorerCPSettings', 'Debug Log Level', 'Set the level of debug information included in the server side log file', 'debugLevel', 'error', 'error', 'dropdown', 'a:1:{s:7:\"options\";a:3:{i:0;a:2:{s:5:\"value\";s:3:\"off\";s:5:\"label\";s:10:\"No Logging\";}i:1;a:2:{s:5:\"value\";s:5:\"error\";s:5:\"label\";s:18:\"Error Logging Only\";}i:2;a:2:{s:5:\"value\";s:5:\"debug\";s:5:\"label\";s:28:\"Error and Debug Info Logging\";}}}', 1); diff --git a/webservice/clienttools/clienttools_syslog.php b/webservice/clienttools/clienttools_syslog.php index 15c5adc..11b6674 100644 --- a/webservice/clienttools/clienttools_syslog.php +++ b/webservice/clienttools/clienttools_syslog.php @@ -1,3 +1,54 @@ get('explorerCPSettings/debugLevel')=='error' || self::doDebugLogging(); + } + + /** + * Return a boolean indicating whether debug logging should be done + * @return boolean + */ + private static function doDebugLogging(){ + return KTConfig::getSingleton()->get('explorerCPSettings/debugLevel')=='debug'; + } + + public static function logInfo(){ + + } + + public static function logError(){ + + } +} ?> \ No newline at end of file diff --git a/webservice/clienttools/comms.php b/webservice/clienttools/comms.php index 5cd541e..50e55ea 100644 --- a/webservice/clienttools/comms.php +++ b/webservice/clienttools/comms.php @@ -42,6 +42,7 @@ include_once('jsonWrapper.php'); include_once('ajaxhandler.php'); include_once('serviceHelper.php'); include_once('client_service.php'); +include_once('clienttools_syslog.php'); //Instantiate base classes $KT = new KTAPI(); -- libgit2 0.21.4