diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 17:21:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 17:21:44 +0200 |
| commit | 8fb8c0d37b68d633e562bbc96f9971917620d181 (patch) | |
| tree | 0fdf062cdfb8e0ef949eb1e9fe8326046417c981 /tools/syslogd.c | |
| parent | 115b15a568c050950517b8bedf067c89b3b7ac30 (diff) | |
| download | rsyslog-8fb8c0d37b68d633e562bbc96f9971917620d181.tar.gz rsyslog-8fb8c0d37b68d633e562bbc96f9971917620d181.tar.bz2 rsyslog-8fb8c0d37b68d633e562bbc96f9971917620d181.zip | |
step: moved config validation code
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 0dbb3c06..63eb55b9 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1433,26 +1433,6 @@ init(void) legacyOptsHook(); - /* some checks */ - if(ourConf->globals.mainQ.iMainMsgQueueNumWorkers < 1) { - errmsg.LogError(0, NO_ERRCODE, "$MainMsgQueueNumWorkers must be at least 1! Set to 1.\n"); - ourConf->globals.mainQ.iMainMsgQueueNumWorkers = 1; - } - - if(ourConf->globals.mainQ.MainMsgQueType == QUEUETYPE_DISK) { - errno = 0; /* for logerror! */ - if(glbl.GetWorkDir() == NULL) { - errmsg.LogError(0, NO_ERRCODE, "No $WorkDirectory specified - can not run main message queue in 'disk' mode. " - "Using 'FixedArray' instead.\n"); - ourConf->globals.mainQ.MainMsgQueType = QUEUETYPE_FIXED_ARRAY; - } - if(ourConf->globals.mainQ.pszMainMsgQFName == NULL) { - errmsg.LogError(0, NO_ERRCODE, "No $MainMsgQueueFileName specified - can not run main message queue in " - "'disk' mode. Using 'FixedArray' instead.\n"); - ourConf->globals.mainQ.MainMsgQueType = QUEUETYPE_FIXED_ARRAY; - } - } - /* check if we need to generate a config DAG and, if so, do that */ if(ourConf->globals.pszConfDAGFile != NULL) generateConfigDAG(ourConf->globals.pszConfDAGFile); |