Skip to content

Commit db0a6f2

Browse files
tbrehmtbrehm
committed
Implemented: FS#872 - Make loglevel configurable from server settings
1 parent 9768157 commit db0a6f2

File tree

5 files changed

+77
-55
lines changed

5 files changed

+77
-55
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ webserver=apache
33
mailserver=postfix
44
dnsserver=mydns
55

6+
67
[server]
78
auto_network_configuration=n
89
ip_address=192.168.0.105
910
netmask=255.255.255.0
1011
gateway=192.168.0.1
1112
hostname=server1.domain.tld
1213
nameservers=192.168.0.1,192.168.0.2
14+
loglevel=2
1315

1416
[mail]
1517
module=postfix_mysql

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,14 @@
119119
'width' => '40',
120120
'maxlength' => '255'
121121
),
122+
'loglevel' => array (
123+
'datatype' => 'INTEGER',
124+
'formtype' => 'SELECT',
125+
'default' => '2',
126+
'value' => array('0' => 'Debug', '1' => 'Warnings', '2' => 'Errors'),
127+
'width' => '40',
128+
'maxlength' => '255'
129+
),
122130
##################################
123131
# ENDE Datatable fields
124132
##################################

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@ $wb["wget_txt"] = 'Path to wget program';
4646
$wb["web_user_txt"] = 'Apache user';
4747
$wb["web_group_txt"] = 'Apache group';
4848
$wb["security_level_txt"] = 'Security level';
49+
$wb["loglevel_txt"] = 'Loglevel';
4950
?>

‎interface/web/admin/templates/server_config_server_edit.htm‎

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,51 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
<p><tmpl_var name="list_desc_txt"></p>
3-
4-
<div class="panel panel_server_config">
5-
6-
<div class="pnl_formsarea">
7-
<fieldset class="inlineLabels">
8-
<div class="ctrlHolder">
9-
<p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
10-
<div class="multiField">
11-
{tmpl_var name='auto_network_configuration'}
12-
</div>
13-
</div>
14-
<div class="ctrlHolder">
15-
<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
16-
<input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
17-
</div>
18-
<div class="ctrlHolder">
19-
<label for="netmask">{tmpl_var name='netmask_txt'}</label>
20-
<input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
21-
</div>
22-
<div class="ctrlHolder">
23-
<label for="gateway">{tmpl_var name='gateway_txt'}</label>
24-
<input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
25-
</div>
26-
<div class="ctrlHolder">
27-
<label for="hostname">{tmpl_var name='hostname_txt'}</label>
28-
<input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255" type="text" class="textInput" />
29-
</div>
30-
<div class="ctrlHolder">
31-
<label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
32-
<input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
33-
<p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
34-
</div>
35-
</fieldset>
36-
37-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
38-
39-
<div class="buttonHolder buttons">
40-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
41-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
42-
</div>
43-
</div>
44-
45-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_server_config">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels">
8+
<div class="ctrlHolder">
9+
<p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
10+
<div class="multiField">
11+
{tmpl_var name='auto_network_configuration'}
12+
</div>
13+
</div>
14+
<div class="ctrlHolder">
15+
<label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
16+
<input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
17+
</div>
18+
<div class="ctrlHolder">
19+
<label for="netmask">{tmpl_var name='netmask_txt'}</label>
20+
<input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
21+
</div>
22+
<div class="ctrlHolder">
23+
<label for="gateway">{tmpl_var name='gateway_txt'}</label>
24+
<input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
25+
</div>
26+
<div class="ctrlHolder">
27+
<label for="hostname">{tmpl_var name='hostname_txt'}</label>
28+
<input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255" type="text" class="textInput" />
29+
</div>
30+
<div class="ctrlHolder">
31+
<label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
32+
<input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
33+
<p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
34+
</div>
35+
<div class="ctrlHolder">
36+
<label for="loglevel">{tmpl_var name='loglevel_txt'}</label>
37+
<select name="loglevel" id="loglevel" class="selectInput">
38+
{tmpl_var name='loglevel'}
39+
</select>
40+
</div>
41+
</fieldset>
42+
43+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
44+
45+
<div class="buttonHolder buttons">
46+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
47+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
48+
</div>
49+
</div>
50+
51+
</div>

‎server/server.php‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,19 @@
5050
}
5151
*/
5252

53+
//* Load the server configuration
54+
if($app->dbmaster->connect()) {
55+
// get the dalaog_id of the last performed record
56+
$server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]);
57+
$conf['last_datalog_id'] = (int)$server_db_record['updated'];
58+
// Load the ini_parser
59+
$app->uses('ini_parser');
60+
// Get server configuration
61+
$conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
62+
// Set the loglevel
63+
$conf["log_priority"] = intval($conf["serverconfig"]["server"]["loglevel"]);
64+
}
65+
5366

5467
// Check if another process is running
5568
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
@@ -75,10 +88,6 @@
7588

7689
if($app->db->connect() && $app->dbmaster->connect()) {
7790

78-
// get the dalaog_id of the last performed record
79-
$server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]);
80-
$conf['last_datalog_id'] = (int)$server_db_record['updated'];
81-
8291
// Check if there is anything to update
8392
$tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE datalog_id > ".$conf['last_datalog_id']." AND (server_id = ".$conf["server_id"]." OR server_id = 0)");
8493
$tmp_num_records = $tmp_rec["number"];
@@ -91,9 +100,7 @@
91100
// Write the Log
92101
$app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);
93102
// Load required base-classes
94-
$app->uses('ini_parser,modules,plugins,file,services');
95-
// Get server configuration
96-
$conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
103+
$app->uses('modules,plugins,file,services');
97104
// Load the modules that are im the mods-enabled folder
98105
$app->modules->loadModules('all');
99106
// Load the plugins that are in the plugins-enabled folder
@@ -110,9 +117,7 @@
110117
// Write the log
111118
$app->log('No Updated records found, starting only the core.', LOGLEVEL_DEBUG);
112119
// Load required base-classes
113-
$app->uses('ini_parser,modules,plugins,file,services');
114-
// Get server configuration
115-
$conf["serverconfig"] = $app->ini_parser->parse_ini_string(stripslashes($server_db_record["config"]));
120+
$app->uses('modules,plugins,file,services');
116121
// Load the modules that are im the mods-core folder
117122
$app->modules->loadModules('core');
118123
// Load the plugins that are in the plugins-core folder

0 commit comments

Comments
 (0)