diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-14 14:44:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-14 14:44:32 +0200 |
| commit | f8dff16a4a1d606f41d738f7381649282c74ca25 (patch) | |
| tree | 2b296620f7f371bacae39023d01b437c9a41dc1e /plugins/imklog/bsd.c | |
| parent | 3669057997e7665735626fd29a40bd10e160c88f (diff) | |
| download | rsyslog-f8dff16a4a1d606f41d738f7381649282c74ca25.tar.gz rsyslog-f8dff16a4a1d606f41d738f7381649282c74ca25.tar.xz rsyslog-f8dff16a4a1d606f41d738f7381649282c74ca25.zip | |
cleanup of imklog + addtl. config directives
- implemented $KLogInternalMsgFacility config directive
- implemented $KLogPermitNonKernelFacility config directive
- modified internal interfaces
Diffstat (limited to 'plugins/imklog/bsd.c')
| -rw-r--r-- | plugins/imklog/bsd.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c index c12103f3..c5b79541 100644 --- a/plugins/imklog/bsd.c +++ b/plugins/imklog/bsd.c @@ -121,7 +121,7 @@ readklog(void) line[i + len] = '\0'; } else { if (i < 0 && errno != EINTR && errno != EAGAIN) { - Syslog(LOG_ERR, + imklogLogIntMsg(LOG_ERR, "imklog error %d reading kernel log - shutting down imklog", errno); fklog = -1; @@ -131,18 +131,18 @@ readklog(void) for (p = line; (q = strchr(p, '\n')) != NULL; p = q + 1) { *q = '\0'; - Syslog(LOG_INFO, "%s", p); + Syslog(LOG_INFO, p); } len = strlen(p); if (len >= MAXLINE - 1) { - Syslog(LOG_INFO, "%s", p); + Syslog(LOG_INFO, p); len = 0; } if (len > 0) memmove(line, p, len + 1); } if (len > 0) - Syslog(LOG_INFO, "%s", line); + Syslog(LOG_INFO, line); } @@ -169,3 +169,13 @@ rsRetVal klogLogKMsg(void) readklog(); RETiRet; } + + +/* provide the (system-specific) default facility for internal messages + * rgerhards, 2008-04-14 + */ +int +klogFacilIntMsg(void) +{ + return LOG_SYSLOG; +} |