diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-14 08:30:52 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-14 08:30:52 +0200 |
| commit | aa4d2a71f353bcd56e8202651d0ea48178614b78 (patch) | |
| tree | 628725357b8dcecd3c8caebddc002d7e1420eda3 /plugins/imklog/solaris.c | |
| parent | 54ae07e33cf28aead4d9318dfc28762cb7211a22 (diff) | |
| parent | 2a8d484a73654c26e427a11fb10162a41a7be79d (diff) | |
| download | rsyslog-aa4d2a71f353bcd56e8202651d0ea48178614b78.tar.gz rsyslog-aa4d2a71f353bcd56e8202651d0ea48178614b78.tar.xz rsyslog-aa4d2a71f353bcd56e8202651d0ea48178614b78.zip | |
Merge branch 'v4-devel' of git+ssh://git.adiscon.com/git/rsyslog into v4-devel
Diffstat (limited to 'plugins/imklog/solaris.c')
| -rw-r--r-- | plugins/imklog/solaris.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/imklog/solaris.c b/plugins/imklog/solaris.c index c2aec30a..8a6d5af1 100644 --- a/plugins/imklog/solaris.c +++ b/plugins/imklog/solaris.c @@ -42,6 +42,7 @@ #include "rsyslog.h" #include "imklog.h" +#include "srUtils.h" #include "unicode-helper.h" #include "solaris_cddl.h" @@ -70,8 +71,8 @@ klogWillRun(void) char errStr[1024]; int err = errno; rs_strerror_r(err, errStr, sizeof(errStr)); - DBGPRINTF("error %d opening log socket: %s\n", - GetPath(), errStr); + DBGPRINTF("error %s opening log socket: %s\n", + errStr, GetPath()); iRet = RS_RET_ERR; // TODO: better error code } @@ -79,6 +80,7 @@ klogWillRun(void) } +#if 0 /* Read /dev/klog while data are available, split into lines. * Contrary to standard BSD syslogd, we do a blocking read. We can * afford this as imklog is running on its own threads. So if we have @@ -125,7 +127,7 @@ readklog(void) break; } - for (p = pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) { + for(p = pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) { *q = '\0'; Syslog(LOG_INFO, (uchar*) p); } @@ -143,6 +145,7 @@ readklog(void) if(pRcv != NULL && (size_t) iMaxLine >= sizeof(bufRcv) - 1) free(pRcv); } +#endif /* to be called in the module's AfterRun entry point |