diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
| commit | ad0fa5175901ba101a1e06f4a39ae56b75f84dca (patch) | |
| tree | b25b46993ddc5339f5ff39da7a219f664f05deac /runtime/conf.c | |
| parent | 6624ad434b5e346a84f600845c09739208382f43 (diff) | |
| parent | 1049537cd853c9714c4bdc3fe4296dda8507900d (diff) | |
| download | rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.gz rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.xz rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/conf.c
runtime/modules.c
runtime/modules.h
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 2e21f3cb..7849598e 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -830,8 +830,7 @@ setActionScope(void) /* now tell each action to start the scope */ node = NULL; while((node = module.GetNxtCnfType(loadConf, node, eMOD_OUT)) != NULL) { - DBGPRINTF("beginning scope on module %s\n", node->pMod->pszName); - node->pMod->mod.om.newScope(); + DBGPRINTF("NO LONGER SUPPORTED beginning scope on module %s\n", node->pMod->pszName); } finalize_it: @@ -855,8 +854,7 @@ unsetActionScope(void) /* now tell each action to restore the scope */ node = NULL; while((node = module.GetNxtCnfType(loadConf, node, eMOD_OUT)) != NULL) { - DBGPRINTF("exiting scope on module %s\n", node->pMod->pszName); - node->pMod->mod.om.restoreScope(); + DBGPRINTF("NO LONGER SUPPORTED exiting scope on module %s\n", node->pMod->pszName); } finalize_it: |