Merge branch 'core37'

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / logs.cgi / config.dat

diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index 4ef89ef75e28bd56c40e49172981c2629d8ae9ca..1f97a170b1259e9e2ad9955db06523852c677b30 100644 (file)
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -32,8 +32,9 @@ $logsettings{'LOGWATCH_LEVEL'} = 'Low';
 $logsettings{'LOGWATCH_KEEP'} = '56';
 my @VS = ('15','50','100','150','250','500');
 $logsettings{'ENABLE_REMOTELOG'} = 'off';
+$logsettings{'ENABLE_ASYNCLOG'} = 'off';
 $logsettings{'REMOTELOG_ADDR'} = '';
-$logsettings{'VARMESSAGES'} = 'daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
+$logsettings{'VARMESSAGES'} = 'cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
 $logsettings{'ACTION'} = '';
 &Header::getcgihash(\%logsettings);
 
@@ -58,7 +59,7 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
   unless ($errormessage)
   {
     &General::writehash("${General::swroot}/logging/settings", \%logsettings);
-    system('/usr/local/bin/restartsyslogd') == 0
+    system('/usr/local/bin/syslogdctrl') == 0
       or $errormessage = "$Lang::tr{'bad return code'} " . $?/256;
   }
 
@@ -66,6 +67,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})
 
 &General::readhash("${General::swroot}/logging/settings", \%logsettings);
 
+$checked{'ENABLE_ASYNCLOG'}{'off'} = '';
+$checked{'ENABLE_ASYNCLOG'}{'on'} = '';
+$checked{'ENABLE_ASYNCLOG'}{$logsettings{'ENABLE_ASYNCLOG'}} = "checked='checked'";
+
 $checked{'ENABLE_REMOTELOG'}{'off'} = '';
 $checked{'ENABLE_REMOTELOG'}{'on'} = '';
 $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'";
@@ -150,6 +155,9 @@ END
 print <<END
 <table width='100%'>
 <tr>
+  <td class='base' colspan='2'><input type='checkbox' name='ENABLE_ASYNCLOG' $checked{'ENABLE_ASYNCLOG'}{'on'} />$Lang::tr{'Async logging enabled'}</td>
+<tr>
+</tr>
   <td>$Lang::tr{'log var messages'}</td><td><input type='text' name='VARMESSAGES' size='50' value='$logsettings{'VARMESSAGES'}' /></td>
 </tr>
 </table>