rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2026-04-09 10:29:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tls

Browse Source
This commit is contained in:
Rainer Gerhards 2008-04-18 14:38:17 +02:00
commit 032b9c1f64
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/rsyslog.c
View File

@ -103,6 +103,19 @@ static rsRetVal dfltErrLogger(uchar *errMsg)
} }
/* set the error log function
* rgerhards, 2008-04-18
*/
rsRetVal
rsrtSetErrLogger(rsRetVal (*errLogger)(uchar*))
{
DEFiRet;
assert(errLogger != NULL);
glblErrLogger = errLogger;
RETiRet;
}
/* globally initialze the runtime system /* globally initialze the runtime system
* NOTE: this is NOT thread safe and must not be called concurrently. If that * NOTE: this is NOT thread safe and must not be called concurrently. If that
* ever poses a problem, we may use proper mutex calls - not considered needed yet. * ever poses a problem, we may use proper mutex calls - not considered needed yet.

1
runtime/rsyslog.h
View File

@ -314,6 +314,7 @@ extern rsRetVal (*glblErrLogger)(uchar*);
rsRetVal rsrtInit(char **ppErrObj, obj_if_t *pObjIF); rsRetVal rsrtInit(char **ppErrObj, obj_if_t *pObjIF);
rsRetVal rsrtExit(void); rsRetVal rsrtExit(void);
int rsrtIsInit(void); int rsrtIsInit(void);
rsRetVal rsrtSetErrLogger(rsRetVal (*errLogger)(uchar*));
#endif /* multi-include protection */ #endif /* multi-include protection */
/* vim:set ai: /* vim:set ai:

1
tools/syslogd.c
View File

@ -2771,6 +2771,7 @@ InitGlobalClasses(void)
/* Intialize the runtime system */ /* Intialize the runtime system */
pErrObj = "rsyslog runtime"; /* set in case the runtime errors before setting an object */ pErrObj = "rsyslog runtime"; /* set in case the runtime errors before setting an object */
CHKiRet(rsrtInit(&pErrObj, &obj)); CHKiRet(rsrtInit(&pErrObj, &obj));
CHKiRet(rsrtSetErrLogger(submitErrMsg)); /* set out error handler */
/* Now tell the system which classes we need ourselfs */ /* Now tell the system which classes we need ourselfs */
pErrObj = "glbl"; pErrObj = "glbl";