maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix not quite correctly webserver-log-piping

Browse Source 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
This commit is contained in:
Michael Kaufmann
2018-05-24 14:44:59 +02:00
parent bad680cfdb
commit f8236dff7b
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -733,19 +733,16 @@ class apache extends HttpConfigBase
$logtype = 'vhost_combined';
}
if (Settings::Get('system.logfiles_piped') == '1') {
// don't use custom-script as path for logfile-names
$error_log = makeCorrectFile($domain['loginname'] . $speciallogfile . '-error.log');
$access_log = makeCorrectFile($domain['loginname'] . $speciallogfile . '-access.log');
if (Settings::Get('system.logfiles_piped') == '1' && Settings::Get('system.logfiles_script') != '') {
// replace for error_log
$command = replace_variables(Settings::Get('system.logfiles_directory'), array(
$command = replace_variables(Settings::Get('system.logfiles_script'), array(
'LOGFILE' => $error_log,
'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname']
));
$logfiles_text .= ' ErrorLog "| ' . $command . "\"\n";
// replace for access_log
$command = replace_variables(Settings::Get('system.logfiles_directory'), array(
$command = replace_variables(Settings::Get('system.logfiles_script'), array(
'LOGFILE' => $access_log,
'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname']