Syslog ng debun improvements #1840
Conversation
* removed backtick shell code invokations in favor of the dollarsign+parentheses style Signed-off-by: Janos SZIGETVARI <jszigetvari@gmail.com>
* harvest the persist file and some others even if the vardir is too big Signed-off-by: Janos SZIGETVARI <jszigetvari@gmail.com>
|
This user does not have permission to start the build. Can one of the admins verify this patch and start the build? (admin please type: ok to test) |
|
@kira-syslogng ok to test |
|
Build SUCCESS, the tests were executed on test branch: master and test suite: functions |
contrib/syslog-ng-debun
Outdated
| echo ${syslogbin}-ctl query get "*" | ||
| if [ -x ${syslogbin}-query ]; then | ||
| #if we reach this brach, then syslog.query.all - as generated above - will not contain any meaningful data | ||
| ${syslogbin}-query sum "*" > ${tmpdir}/syslog.query.all 2>/dev/null | ||
| rm ${tmpdir}/syslog.query.all.${tsdata} | ||
| ts=$( timestamp ) |
There was a problem hiding this comment.
This variable is not used anywhere ?
There was a problem hiding this comment.
That's a typo all right.
Corrected.
contrib/syslog-ng-debun
Outdated
| echo ${syslogbin}-ctl stats | ||
| ${syslogbin}-ctl query get "*" > ${tmpdir}/syslog.query.all 2>/dev/null | ||
| tsdata=$( timestamp ) | ||
| ${syslogbin}-ctl query get "*" > ${tmpdir}/syslog.query.all.${tsdata} 2>/dev/null |
There was a problem hiding this comment.
Maybe we could save the stderr also for the query.
There was a problem hiding this comment.
Saving the stderr output is not really helpful in this case. I don't want the user to see it, and we won't use it do determine why it did not work. The other parts of the script will give us enough information about syslog's state, so that we won't need stderr here.
contrib/syslog-ng-debun
Outdated
| @@ -1243,6 +1264,7 @@ setup_env_solaris () { | |||
| netstatlunp () { netstat -P udp -na ; } | |||
| myplimit () { plimit $1 ; } | |||
| free () { prtconf | grep Mem ; printf Pagesize:\ ; pagesize -a ; } | |||
| timestamp () { /usr/bin/perl -e 'print time, "\n";' ; } | |||
There was a problem hiding this comment.
Why the timestamp re-defined here ?
There was a problem hiding this comment.
The script has to run on multiple different platforms. This means that we have to handle somehow when a given OS behaves differently than the others. That is why we introduced OS-specific re-definitions of shell functions or variables.
In this specific case, Solaris does not support the date +%s way of getting the unix timestamp, so we had to override the default way of doing it.
There was a problem hiding this comment.
Ok, one minor thing the path of perl I think should not be absolute (at least not hard coded absolute path), see also the sed_equivalent_cmd, where perl is relative.
* added timestamps to the generated stats files
* added code to generate stats a second time at the end
* this way it will be possible to calculate EPS values based on the stat diffs
Signed-off-by: Janos SZIGETVARI <jszigetvari@gmail.com>
jszigetvari
force-pushed
the
syslog-ng-debun-improvements
branch
from
6e94213 to
7596040
Compare
|
Build SUCCESS, the tests were executed on test branch: master and test suite: functions |
contrib/syslog-ng-debun
Outdated
| #handy-dandy delay magic, triggered when we'd step on our own foot | ||
| [ -f ${tmpdir}/syslog.stats.${tsdata} ] && sleep 5 && tsdata=$( timestamp ) | ||
|
|
||
| ${syslogbin}-ctl stats > ${tmpdir}/syslog.stats.${tsdata} 2>&1 |
There was a problem hiding this comment.
It would be better (for reading) to create a separate variable for ${syslogbin}-ctl it is used in a few places.
* fixed a typo in the example about syslog-ng residing in a custom place
(Thank you Endre for pointing it out.)
contrib/syslog-ng-debun: miscellaneous modifications
* version bump
* put the paths for syslog-ng-ctl and syslog-ng-query into separate variables
Signed-off-by: Janos SZIGETVARI <jszigetvari@gmail.com>
|
Build SUCCESS, the tests were executed on test branch: master and test suite: functions |
Details: