src: style sweeep and sync

This commit is contained in:
Franco Fichtner 2020-04-19 12:17:31 +02:00
parent ab04204151
commit 15737656ed
3 changed files with 7 additions and 3 deletions

View File

@ -36,10 +36,12 @@ Copyright (c) 2003-2006 Manuel Kasper <mk@neon1.net>
Copyright (c) 2012 Marcello Coutinho
Copyright (c) 2018 Martin Wasley <martin@team-rebellion.net>
Copyright (c) 2010-2015 Michael Bostock
Copyright (c) 2019 Michael Muenz <m.muenz@gmail.com>
Copyright (c) 2019 Pascal Mathis <mail@pascalmathis.com>
Copyright (c) 2005-2006 Paul Taylor <paultaylor@winn-dixie.com>
Copyright (c) 2005-2006 Peter Allgeyer <allgeyer@web.de>
Copyright (c) 2004 Peter Curran <peter@closeconsultants.com>
Copyright (c) 2020 Petr Kejval <petr.kejval6@gmail.com>
Copyright (c) 2018 René Muhr <rene@team-rebellion.net>
Copyright (c) 2015 S. Linke <dev@devsash.de>
Copyright (c) 2007 Sam Wenham

View File

@ -238,7 +238,8 @@ function dpinger_configure_do($verbose = false, $gwname = null)
/* command to run on alarm */
$params .= '-C "/usr/local/etc/rc.syshook monitor" ';
foreach ([
foreach (
[
'interval' => '-s %ss ',
'loss_interval' => '-l %ss ',
'time_period' => '-t %ss ',
@ -246,7 +247,8 @@ function dpinger_configure_do($verbose = false, $gwname = null)
'latencyhigh' => '-D %s ',
'losshigh' => '-L %s ',
'data_length' => '-d %s '
] as $pname => $ppattern) {
] as $pname => $ppattern
) {
$params .= exec_safe(
$ppattern,
isset($gateway[$pname]) && is_numeric($gateway[$pname]) ?

View File

@ -79,7 +79,7 @@ class LogController extends ApiControllerBase
}
$response = $backend->configdpRun("system diag log", array(0, 0, $searchPhrase, $module, $scope));
$this->response->setRawHeader("Content-Type: text/csv");
$this->response->setRawHeader("Content-Disposition: attachment; filename=".$scope.".log");
$this->response->setRawHeader("Content-Disposition: attachment; filename=" . $scope . ".log");
foreach (json_decode($response, true)['rows'] as $row) {
printf("%s\t%s\n", $row['timestamp'], $row['line']);
}