summaryrefslogtreecommitdiffstats
path: root/runtime/rsyslog.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-10-05 16:10:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-10-05 16:10:27 +0200
commitc7e9e2123ee71fb868bbcff59225e009e21af590 (patch)
tree12ab52bb20cb34c9fcd36816e836a1959440d5fc /runtime/rsyslog.c
parent304ab88dd64b2ae46554fa5394aa8822194b1e95 (diff)
parentb5afa1a5be2909ed13f77ef0e0804bab75325198 (diff)
downloadrsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.gz
rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.tar.bz2
rsyslog-c7e9e2123ee71fb868bbcff59225e009e21af590.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.c')
-rw-r--r--runtime/rsyslog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c
index a9794840..8baa2b59 100644
--- a/runtime/rsyslog.c
+++ b/runtime/rsyslog.c
@@ -82,6 +82,7 @@
#include "ruleset.h"
#include "parser.h"
#include "strgen.h"
+#include "statsobj.h"
#include "atomic.h"
/* forward definitions */
@@ -150,6 +151,8 @@ rsrtInit(char **ppErrObj, obj_if_t *pObjIF)
* class immediately after it is initialized. And, of course, we load those classes
* first that we use ourselfs... -- rgerhards, 2008-03-07
*/
+ if(ppErrObj != NULL) *ppErrObj = "statsobj";
+ CHKiRet(statsobjClassInit(NULL));
if(ppErrObj != NULL) *ppErrObj = "prop";
CHKiRet(propClassInit(NULL));
if(ppErrObj != NULL) *ppErrObj = "glbl";