summaryrefslogtreecommitdiffstats
path: root/runtime/rsconf.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-04 14:41:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-04 14:41:08 +0200
commit79d46017e49d39b5de2d783cc3bcbeb696535bfc (patch)
tree640cf7d51a20d2479e2057694b4baddc8d33274c /runtime/rsconf.c
parentb7315fc8369993d462389412b29b132fd2963d72 (diff)
downloadrsyslog-79d46017e49d39b5de2d783cc3bcbeb696535bfc.tar.gz
rsyslog-79d46017e49d39b5de2d783cc3bcbeb696535bfc.tar.bz2
rsyslog-79d46017e49d39b5de2d783cc3bcbeb696535bfc.zip
step: imudp utilizes interim new input module interface
Diffstat (limited to 'runtime/rsconf.c')
-rw-r--r--runtime/rsconf.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index 482622a1..8fc30cf3 100644
--- a/runtime/rsconf.c
+++ b/runtime/rsconf.c
@@ -345,6 +345,7 @@ static rsRetVal
tellInputsActivateConfig(void)
{
cfgmodules_etry_t *node;
+ rsRetVal localRet;
BEGINfunc
DBGPRINTF("telling inputs to activate config %p\n", runConf);
@@ -353,7 +354,12 @@ tellInputsActivateConfig(void)
if(node->canActivate) {
DBGPRINTF("activating config %p for module %s\n",
runConf, node->pMod->pszName);
- node->pMod->mod.im.activateCnf(node->modCnf);
+ localRet = node->pMod->mod.im.activateCnf(node->modCnf);
+ if(localRet != RS_RET_OK) {
+ errmsg.LogError(0, localRet, "activation of module %s failed",
+ node->pMod->pszName);
+ node->canActivate = 0; /* in a sense, could not activate... */
+ }
}
node = module.GetNxtCnfType(runConf, node, eMOD_IN);
}