From b1ec4aa9b0f03358440e7bb9b18dc6702b8aac34 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 17 Jul 2020 19:32:22 +0200 Subject: [PATCH] syslog: don't generate clog files when disable_clog is set. eventually we should also prevent the legacy syslog from starting, but first make sure we don't polute the filesystem in these cases --- src/etc/inc/system.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 21b44327b..81e0bdaf9 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -653,15 +653,17 @@ EOD; $syslogd_extra .= exec_safe('-f %s ', '/var/etc/syslog.conf'); // setup log files for all facilities including default - $default_logfile_size = !empty($syslogcfg['logfilesize']) ? $syslogcfg['logfilesize'] : '511488'; - $syslog_files = array_keys($syslogconfs); - $syslog_files = array_merge($syslog_files, array('system', 'vpn')); - foreach ($syslog_files as $syslog_fn) { - $filename = "/var/log/" . basename($syslog_fn) . ".log"; - if (!file_exists($filename)) { - mwexecf('/usr/local/sbin/clog -i -s %s %s', array($default_logfile_size, $filename)); + if (empty($config['syslog']['disable_clog'])) { + $default_logfile_size = !empty($syslogcfg['logfilesize']) ? $syslogcfg['logfilesize'] : '511488'; + $syslog_files = array_keys($syslogconfs); + $syslog_files = array_merge($syslog_files, array('system', 'vpn')); + foreach ($syslog_files as $syslog_fn) { + $filename = "/var/log/" . basename($syslog_fn) . ".log"; + if (!file_exists($filename)) { + mwexecf('/usr/local/sbin/clog -i -s %s %s', array($default_logfile_size, $filename)); + } + mwexecf('chmod 0600 %s', array($filename)); } - mwexecf('chmod 0600 %s', array($filename)); } if (!$restart && isvalidpid('/var/run/syslog.pid')) {