From fe4566b0010d4871c47547bcab87a7bd8d1e2660 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 8 Apr 2015 19:00:55 +0000 Subject: [PATCH] fix parameter for webgui restart delay --- src/etc/rc.restart_webgui | 4 ++-- src/www/diag_logs_settings.php | 2 +- src/www/system_advanced_admin.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui index e07c86401..22a9db201 100755 --- a/src/etc/rc.restart_webgui +++ b/src/etc/rc.restart_webgui @@ -7,9 +7,9 @@ require_once('shaper.inc'); require_once('captiveportal.inc'); require_once('rrd.inc'); -if (count($argv) > 1 && $argv[1] == 'delayed') { +if (count($argv) > 1 && is_numeric($argv[1])) { // starting delayed. - sleep(2); + sleep($argv[1]); } echo 'Restarting webConfigurator...'; diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index 9ce61e223..e73ad2236 100644 --- a/src/www/diag_logs_settings.php +++ b/src/www/diag_logs_settings.php @@ -160,7 +160,7 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { ob_flush(); flush(); log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); - configd_run("webgui restart delayed", true); + configd_run("webgui restart 2", true); $savemsg .= "
" . gettext("WebGUI process is restarting."); } diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index 71b01de9f..1f50f7f2c 100644 --- a/src/www/system_advanced_admin.php +++ b/src/www/system_advanced_admin.php @@ -615,7 +615,7 @@ if ($restart_webgui) { ob_flush(); flush(); log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); - configd_run("webgui restart delayed", true); + configd_run("webgui restart 2", true); } ?>