diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-15 16:11:05 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-15 16:11:05 +0200 |
commit | 188e4f39fd3c267159c32f750f1da0bc74db910e (patch) | |
tree | f19a40ae560d8e80acf6965f235dca0fcda05798 /plugins/immark | |
parent | 19864adc4799ce57204fdabb7049e8ec856ed452 (diff) | |
parent | 38cdfcfbe1c1ed6aa4a22623afc43d199bc5f7a8 (diff) | |
download | rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.tar.gz rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.tar.xz rsyslog-188e4f39fd3c267159c32f750f1da0bc74db910e.zip |
Merge branch 'master' into beta
Diffstat (limited to 'plugins/immark')
-rw-r--r-- | plugins/immark/.cvsignore | 6 | ||||
-rw-r--r-- | plugins/immark/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/immark/immark.c | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/plugins/immark/.cvsignore b/plugins/immark/.cvsignore deleted file mode 100644 index 9730646f..00000000 --- a/plugins/immark/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/plugins/immark/Makefile.am b/plugins/immark/Makefile.am index 3dc0e408..9c0f8f64 100644 --- a/plugins/immark/Makefile.am +++ b/plugins/immark/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = immark.la immark_la_SOURCES = immark.c immark.h -immark_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) +immark_la_CPPFLAGS = $(rsrt_cflags) -I$(top_srcdir) $(pthreads_cflags) immark_la_LDFLAGS = -module -avoid-version immark_la_LIBADD = diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c index 0bc31995..bdca4d58 100644 --- a/plugins/immark/immark.c +++ b/plugins/immark/immark.c @@ -37,9 +37,10 @@ #include <signal.h> #include <string.h> #include <pthread.h> -#include "syslogd.h" +#include "dirty.h" #include "cfsysline.h" #include "module-template.h" +#include "errmsg.h" MODULE_TYPE_INPUT @@ -75,7 +76,7 @@ CODESTARTrunInput * rgerhards, 2007-12-17 */ CHKiRet(thrdSleep(pThrd, iMarkMessagePeriod, 0)); /* seconds, micro seconds */ - logmsgInternal(LOG_INFO, "-- MARK --", ADDDATE|MARK); + logmsgInternal(NO_ERRCODE, LOG_INFO, (uchar*)"-- MARK --", ADDDATE|MARK); } finalize_it: return iRet; |