diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-08 09:41:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-08 09:41:12 +0200 |
| commit | fc861c0a504bfea58fea66bbf65738446117d668 (patch) | |
| tree | 6c5183523c3ad608904119bfb109cd802ee37f05 /runtime/queue.c | |
| parent | 40de50a892ffc3fa16c49c8ba91c7a1cd5af1b95 (diff) | |
| parent | 0817fc95a810df497c52200c772fac743ca84dde (diff) | |
| download | rsyslog-fc861c0a504bfea58fea66bbf65738446117d668.tar.gz rsyslog-fc861c0a504bfea58fea66bbf65738446117d668.tar.bz2 rsyslog-fc861c0a504bfea58fea66bbf65738446117d668.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 600b5688..85b1e45b 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2760,6 +2760,12 @@ qqueueApplyCnfParam(qqueue_t *pThis, struct cnfparamvals *pvals) "param '%s'\n", pblk.descr[i].name); } } + if(pThis->qType == QUEUETYPE_DISK && pThis->pszFilePrefix == NULL) { + errmsg.LogError(0, RS_RET_QUEUE_DISK_NO_FN, "error on queue '%s', disk mode selected, but " + "no queue file name given; queue type changed to 'linkedList'", + obj.GetName((obj_t*) pThis)); + pThis->qType = QUEUETYPE_LINKEDLIST; + } cnfparamvalsDestruct(pvals, &pblk); return RS_RET_OK; } |