rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-12 19:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench: increase timeout for test + better to exp reporting

Browse Source
This commit is contained in:
Rainer Gerhards 2019-02-18 19:22:13 +01:00
parent febfb4e266
commit 72982ed3f8
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/imdiag/imdiag.c
View File

@ -605,6 +605,7 @@ timeoutGuard(ATTR_UNUSED void *arg)
{ {
assert(abortTimeout != -1); assert(abortTimeout != -1);
sigset_t sigSet; sigset_t sigSet;
time_t strtTO;
time_t endTO; time_t endTO;
/* block all signals except SIGTTIN and SIGSEGV */ /* block all signals except SIGTTIN and SIGSEGV */
@ -614,8 +615,8 @@ timeoutGuard(ATTR_UNUSED void *arg)
dbgprintf("timeoutGuard: timeout %d seconds, time %lld\n", abortTimeout, (long long) time(NULL)); dbgprintf("timeoutGuard: timeout %d seconds, time %lld\n", abortTimeout, (long long) time(NULL));
time(&endTO); time(&strtTO);
endTO += abortTimeout; endTO = strtTO + abortTimeout;
while(1) { while(1) {
int to = endTO - time(NULL); int to = endTO - time(NULL);
@ -633,8 +634,8 @@ timeoutGuard(ATTR_UNUSED void *arg)
dbgprintf("timeoutGuard: sleep expired, aborting\n"); dbgprintf("timeoutGuard: sleep expired, aborting\n");
/* note: we use fprintf to stderr intentionally! */ /* note: we use fprintf to stderr intentionally! */
fprintf(stderr, "timeoutGuard: rsyslog still active after expiry of guard " fprintf(stderr, "timeoutGuard: rsyslog still active after expiry of guard "
"period (endTO %lld, time now %lld) - initiating abort()\n", "period (strtTO %lld, endTO %lld, time now %lld, diff %lld) - initiating abort()\n",
(long long) endTO, (long long) time(NULL)); (long long) strtTO, (long long) endTO, (long long) time(NULL), (long long) (time(NULL) - strtTO));
fflush(stderr); fflush(stderr);
abort(); abort();
} }

1
tests/queue-encryption-disk_keyfile-vg.sh
View File

@ -9,6 +9,7 @@ main_queue(queue.filename="mainq"
queue.type="disk" queue.type="disk"
queue.maxDiskSpace="4m" queue.maxDiskSpace="4m"
queue.maxfilesize="1m" queue.maxfilesize="1m"
queue.timeoutshutdown="20000"
queue.timeoutenqueue="300000" queue.timeoutenqueue="300000"
queue.lowwatermark="5000" queue.lowwatermark="5000"