Revision 4d09ffde
Added by k-paulius almost 9 years ago
| src/etc/inc/system.inc | ||
|---|---|---|
| 1097 | 1097 |
$syslogd_extra = "-f {$g['varetc_path']}/syslog.conf {$sourceip}";
|
| 1098 | 1098 |
} |
| 1099 | 1099 |
|
| 1100 |
$log_sockets = array(); |
|
| 1101 |
$log_sockets[] = "{$g['dhcpd_chroot_path']}/var/run/log";
|
|
| 1100 |
$log_sockets = array("{$g['dhcpd_chroot_path']}/var/run/log");
|
|
| 1102 | 1101 |
|
| 1103 | 1102 |
if (isset($config['installedpackages']['package'])) {
|
| 1104 | 1103 |
foreach ($config['installedpackages']['package'] as $package) {
|
| 1105 |
if (isset($package['logging']['logsocket']) && '' != $package['logging']['logsocket'] && |
|
| 1106 |
is_dir(pathinfo($package['logging']['logsocket'], PATHINFO_DIRNAME)) && !in_array($package['logging']['logsocket'], $log_sockets)) {
|
|
| 1104 |
if (isset($package['logging']['logsocket']) && $package['logging']['logsocket'] != '' && |
|
| 1105 |
is_dir(dirname($package['logging']['logsocket'])) && |
|
| 1106 |
!in_array($package['logging']['logsocket'], $log_sockets)) {
|
|
| 1107 | 1107 |
$log_sockets[] = $package['logging']['logsocket']; |
| 1108 | 1108 |
} |
| 1109 | 1109 |
} |
| src/usr/local/www/status_pkglogs.php | ||
|---|---|---|
| 83 | 83 |
if (!$apkg) { // If we aren't looking for a specific package, locate the first package that handles logging.
|
| 84 | 84 |
if (isset($config['installedpackages']['package'])) {
|
| 85 | 85 |
foreach ($config['installedpackages']['package'] as $package) {
|
| 86 |
if (isset($package['logging']['logfilename']) && '' != $package['logging']['logfilename']) {
|
|
| 86 |
if (isset($package['logging']['logfilename']) && $package['logging']['logfilename'] != '') {
|
|
| 87 | 87 |
$pkgwithlogging = true; |
| 88 | 88 |
$apkg = $package['name']; |
| 89 | 89 |
$apkgid = $i; |
Also available in: Unified diff
Code style changes
(cherry picked from commit b2836666a8e7fc021ea750fafc8fc6e8097d52ff)