Merge branch '6856-limit-log-messages' into 'develop'

Implement limitation of db log messages that exceed a defined limit

Closes #6856

See merge request ispconfig/ispconfig3!2008

Author: Till Brehm

install/tpl/config.inc.php.master

@@ -139,6 +139,7 @@ $conf['demo_mode'] = false;
 //** Logging
 $conf['log_file'] = $conf['ispconfig_log_dir'].$conf['fs_div'].'ispconfig.log';
 $conf['log_priority'] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error
+$conf['db_log_message_max_length'] = 32768;
 
 
 //** Themes

install/update.php

@@ -187,6 +187,8 @@
 
 $conf['server_id'] = intval($conf_old["server_id"]);
 $conf['ispconfig_log_priority'] = $conf_old["log_priority"];
+$conf['db_log_message_max_length'] = (isset($conf_old['db_log_message_max_length'])) ? $conf_old['db_log_message_max_length'] : '32768';
+
 
 $inst = new installer();
 $inst->is_update = true;
@@ -377,25 +379,25 @@
 
 if(isset($conf['apache']['installed']) && $conf['apache']['installed'] == true || isset($conf['nginx']['installed']) && $conf['nginx']['installed'] == true) {
 	$conf['services']['web'] = check_service_config_state('web_server', true);
-} else { 
+} else {
 	$conf['services']['web'] = check_service_config_state('web_server', false);
 }
 
 if(isset($conf['xmpp']['installed']) && $conf['xmpp']['installed'] == true) {
 	$conf['services']['xmpp'] = check_service_config_state('xmpp_server', true);
-} else { 
+} else {
 	$conf['services']['xmpp'] = check_service_config_state('xmpp_server', false);
 }
 
 if(isset($conf['ufw']['installed']) && $conf['ufw']['installed'] == true || isset($conf['firewall']['installed']) && $conf['firewall']['installed'] == true) {
 	$conf['services']['firewall'] = check_service_config_state('firewall_server', true);
-} else { 
+} else {
 	$conf['services']['firewall'] = check_service_config_state('firewall_server', false);
 }
 
 if(isset($conf['vserver']['installed']) && $conf['vserver']['installed'] == true) {
 	$conf['services']['vserver'] = check_service_config_state('vserver_server', true);
-} else { 
+} else {
 	$conf['services']['vserver'] = check_service_config_state('vserver_server', false);
 }
 

server/lib/app.inc.php

@@ -311,18 +311,26 @@ function log($msg, $priority = 0, $dblog = true) {
 			if($dblog === true && isset($this->dbmaster)) {
 				$server_id = $conf['server_id'];
 				$loglevel = $priority;
-				$message = $msg;
-				$datalog_id = (isset($this->modules->current_datalog_id) && $this->modules->current_datalog_id > 0)? $this->modules->current_datalog_id : 0;
+
+				// Truncate the message for database logging if a limit is set and if the message exceeds that limit
+				// Full message is logged to the logfiles
+				$db_message = $msg;
+				if(isset($conf['db_log_message_max_length']) && is_int($conf['db_log_message_max_length']) && $conf['db_log_message_max_length'] > 0) {
+					if(strlen($db_message) > $conf['db_log_message_max_length']) {
+						$db_message = substr($db_message, 0, $conf['db_log_message_max_length']) . '...';
+					}
+				}
+
+				$datalog_id = (isset($this->modules->current_datalog_id) && $this->modules->current_datalog_id > 0) ? $this->modules->current_datalog_id : 0;
 				if($datalog_id > 0) {
 					$tmp_rec = $this->dbmaster->queryOneRecord("SELECT count(syslog_id) as number FROM sys_log WHERE datalog_id = ? AND loglevel = ?", $datalog_id, LOGLEVEL_ERROR);
-					//* Do not insert duplicate errors into the web log.
 					if($tmp_rec['number'] == 0) {
 						$sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES (?, ?, ?, UNIX_TIMESTAMP(), ?)";
-						$this->dbmaster->query($sql, $server_id, $datalog_id, $loglevel, $message);
+						$this->dbmaster->query($sql, $server_id, $datalog_id, $loglevel, $db_message);
 					}
 				} else {
 					$sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES (?, 0, ?, UNIX_TIMESTAMP(), ?)";
-					$this->dbmaster->query($sql, $server_id, $loglevel, $message);
+					$this->dbmaster->query($sql, $server_id, $loglevel, $db_message);
 				}
 			}