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

Merge pull request #785 from patschi/logformat

Browse Source 
Allow using more advanced webserver LogFormat
This commit is contained in:
Michael Kaufmann
2020-01-09 09:16:03 +01:00
committed by GitHub
parent a5287726a4 b393c7d6e6
commit f55ad16d82
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Cron/Http/Apache.php
View File

@@ -760,7 +760,7 @@ class Apache extends HttpConfigBase
$logtype = 'combined';
if (Settings::Get('system.logfiles_format') != '') {
$logtype = 'frx_custom';
$logfiles_text .= ' LogFormat "' . Settings::Get('system.logfiles_format') . '" ' . $logtype . "\n";
$logfiles_text .= ' LogFormat ' . Settings::Get('system.logfiles_format') . ' ' . $logtype . "\n";
}
if (Settings::Get('system.logfiles_type') == '2' && Settings::Get('system.logfiles_format') == '') {
$logtype = 'vhost_combined';

2
lib/Froxlor/Cron/Http/Nginx.php
View File

@@ -71,7 +71,7 @@ class Nginx extends HttpConfigBase
}
$logtype = 'frx_custom';
$this->nginx_data[$vhosts_filename] = 'log_format ' . $logtype . ' "' . Settings::Get('system.logfiles_format') . '";' . "\n";
$this->nginx_data[$vhosts_filename] = 'log_format ' . $logtype . ' ' . Settings::Get('system.logfiles_format') . ';' . "\n";
}
}

2
lib/Froxlor/Froxlor.php
View File

@@ -10,7 +10,7 @@ final class Froxlor
const VERSION = '0.10.11';
// Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '201912311';
const DBVERSION = '201912312';
// Distribution branding-tag (used for Debian etc.)
const BRANDING = '';