Skip to content

Commit 59bfbc0

Browse files
committed
Implements #6714 - Add --debug option to server.sh script
1 parent cf1ba5e commit 59bfbc0

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

server/server.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
// Set Lockfile
4747
@file_put_contents($conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', getmypid());
4848

49+
// Set debug log level if --debug argument is passed to the script
50+
if(isset($argv[1]) && $argv[1] == '--debug') $conf['log_priority'] = 0;
51+
4952
if($conf['log_priority'] <= LOGLEVEL_DEBUG) print 'Set Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock' . "\n";
5053

5154
require SCRIPT_PATH."/lib/app.inc.php";
@@ -82,7 +85,11 @@
8285
$conf['serverconfig'] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record['config']));
8386

8487
// Set the loglevel
85-
$conf['log_priority'] = intval($conf['serverconfig']['server']['loglevel']);
88+
if(isset($argv[1]) && $argv[1] == '--debug') {
89+
$conf['log_priority'] = 0;
90+
} else {
91+
$conf['log_priority'] = intval($conf['serverconfig']['server']['loglevel']);
92+
}
8693

8794
// Set level from which admin should be notified by email
8895
if(!isset($conf['serverconfig']['server']['admin_notify_events']) || $conf['serverconfig']['server']['admin_notify_events'] == '') $conf['serverconfig']['server']['admin_notify_events'] = 3;

server/server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $(which php) -q \
1919
-d disable_classes= \
2020
-d disable_functions= \
2121
-d open_basedir= \
22-
/usr/local/ispconfig/server/server.php
22+
/usr/local/ispconfig/server/server.php "$@"
2323

2424
cd /usr/local/ispconfig/security
2525
$(which php) -q \

0 commit comments

Comments
 (0)