summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/status_logs.php
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-12-21 08:55:52 -0500
committerStephen Beaver <sbeaver@netgate.com>2015-12-21 08:55:52 -0500
commitffa383cb968dc4a57421e3fcaf31a7b5284d5e9b (patch)
tree0645af49bcc3fff58e336976630f91c86cbaeabb /src/usr/local/www/status_logs.php
parent07271d6c92c9b9e8e3f4f157b8f6254d86629979 (diff)
parent3c85b0f9cfab5ebd3a490f84f493efc964612955 (diff)
downloadpfsense-ffa383cb968dc4a57421e3fcaf31a7b5284d5e9b.zip
pfsense-ffa383cb968dc4a57421e3fcaf31a7b5284d5e9b.tar.gz
Merge pull request #2301 from NOYB/Staus_-_System_-_Logs_-_Write_Config_Only
Diffstat (limited to 'src/usr/local/www/status_logs.php')
-rwxr-xr-xsrc/usr/local/www/status_logs.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index 9b069f0..4a1ff52 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -214,17 +214,27 @@ if ($save_settings) {
if ($logfile == 'system') {
$oldnologlighttpd = isset($config['syslog']['nologlighttpd']);
$config['syslog']['nologlighttpd'] = $loglighttpd ? false : true;
+
+ if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) {
+ $logging_changed = $lighttpd_logging_changed = true;
+ }
}
- write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"]));
+ // If any of the logging settings were changed then backup and sync (standard write_config). Otherwise only write config (don't backup, don't sync).
+ if ($logging_changed) {
+ write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"]), $backup = true, $write_config_only = false);
+ $retval = 0;
+ $retval = system_syslogd_start();
+ } else {
+ write_config($desc = "Log Display Settings Saved (no backup, no sync): " . gettext($allowed_logs[$logfile]["name"]), $backup = false, $write_config_only = true);
+ }
- $retval = 0;
- $savemsg = get_std_save_message($retval);
+ $savemsg = gettext("The changes have been applied successfully.");
# System General (main) Specific
if ($logfile == 'system') {
- if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) {
+ if ($lighttpd_logging_changed) {
ob_flush();
flush();
log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
OpenPOWER on IntegriCloud