From 16e92a47ac73dcda92b2e51b854fd9010319f05f Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 17 Dec 2007 13:09:18 +0000 Subject: fixed missing file --- plugins/imklog/imklog.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 plugins/imklog/imklog.h (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h new file mode 100644 index 00000000..c00b3c3f --- /dev/null +++ b/plugins/imklog/imklog.h @@ -0,0 +1,41 @@ +/* imklog.h + * These are the definitions for the klog message generation module. + * + * File begun on 2007-12-17 by RGerhards + * + * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. + * + * Rsyslog is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Rsyslog is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Rsyslog. If not, see . + * + * A copy of the GPL can be found in the file "COPYING" in this distribution. + */ +#ifndef IMKLOG_H_INCLUDED +#define IMKLOG_H_INCLUDED 1 + +#include "rsyslog.h" + +/* prototypes */ +extern int InitKsyms(char *); +extern int InitMsyms(void); +extern char * ExpandKadds(char *, char *); +extern void SetParanoiaLevel(int); +extern void vsyslog(int pri, const char *fmt, va_list ap); +rsRetVal Syslog(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); + +#endif /* #ifndef IMKLOG_H_INCLUDED */ +/* + * vi:set ai: + */ -- cgit v1.2.3 From 936bbc5071b7a64ca70e4dd9b0c34216738f62b1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 17 Dec 2007 13:29:35 +0000 Subject: fix for compile problem --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index c00b3c3f..f82759c8 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -26,6 +26,7 @@ #define IMKLOG_H_INCLUDED 1 #include "rsyslog.h" +#include "syslogd.h" /* prototypes */ extern int InitKsyms(char *); -- cgit v1.2.3 From cc8d4f19bb722993be5aaa8b6790bec4d43c5684 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 17 Dec 2007 13:42:06 +0000 Subject: limited debug output --- plugins/imklog/imklog.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index f82759c8..d9bd3c02 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -28,6 +28,9 @@ #include "rsyslog.h" #include "syslogd.h" +/* global variables */ +extern int dbgPrintSymbols; + /* prototypes */ extern int InitKsyms(char *); extern int InitMsyms(void); -- cgit v1.2.3 From 81d32abb341f087ce6d1d05ed8ed12949a69654d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 19 Mar 2008 17:35:09 +0000 Subject: bugfix: imklog leaked several hundered KB on each HUP. Thanks to varmojfekoj for the patch --- plugins/imklog/imklog.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index d9bd3c02..2db75009 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -33,7 +33,9 @@ extern int dbgPrintSymbols; /* prototypes */ extern int InitKsyms(char *); +extern void DeinitKsyms(void); extern int InitMsyms(void); +extern void DeinitMsyms(void); extern char * ExpandKadds(char *, char *); extern void SetParanoiaLevel(int); extern void vsyslog(int pri, const char *fmt, va_list ap); -- cgit v1.2.3 From 769598da4cfc7c9fb3ceb337044a9313e4b1b68d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 8 Apr 2008 14:40:19 +0200 Subject: cleanup and bugfix in imklog - some cleanup in imklog - bugfix: potential segfault in imklog when kernel is compiled without /proc/kallsyms and the file System.map is missing. Thanks to Andrea Morandi for pointing it out and suggesting a fix. --- plugins/imklog/imklog.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 2db75009..71525a79 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -42,6 +42,5 @@ extern void vsyslog(int pri, const char *fmt, va_list ap); rsRetVal Syslog(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); #endif /* #ifndef IMKLOG_H_INCLUDED */ -/* - * vi:set ai: +/* vi:set ai: */ -- cgit v1.2.3 From 838072a22f5a98e150dbab055eba28453238109f Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 8 Apr 2008 23:34:14 +0200 Subject: changed imklog to a driver interface imklog now uses os-specific drivers. The initial "set" contains the linux driver. This is a prequisite for BSD klog, which can now be implemented on that driver interface. --- plugins/imklog/imklog.h | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 71525a79..0ac25d6c 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -2,8 +2,10 @@ * These are the definitions for the klog message generation module. * * File begun on 2007-12-17 by RGerhards + * Major change: 2008-04-09: switched to a driver interface for + * several platforms * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2008 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -28,7 +30,26 @@ #include "rsyslog.h" #include "syslogd.h" -/* global variables */ +/* interface to "drivers" + * the platform specific drivers must implement these entry points. Only one + * driver may be active at any given time, thus we simply rely on the linker + * to resolve the addresses. + * rgerhards, 2008-04-09 + */ +rsRetVal klogLogKMsg(void); +rsRetVal klogWillRun(void); +rsRetVal klogAfterRun(void); + +/* the following data members may be accessed by the "drivers" + * I admit this is not the cleanest way to doing things, but I honestly + * believe it is appropriate for the job that needs to be done. + * rgerhards, 2008-04-09 + */ +extern int symbols_twice; +extern int use_syscall; +extern int symbol_lookup; +extern char *symfile; +extern int console_log_level; extern int dbgPrintSymbols; /* prototypes */ -- cgit v1.2.3 From 0b447f310ac057ba59f0238f5bd663c993a823c2 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 9 Apr 2008 09:06:40 +0200 Subject: implemented klog driver for BSD --- plugins/imklog/imklog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 0ac25d6c..2fea879f 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -59,7 +59,7 @@ extern int InitMsyms(void); extern void DeinitMsyms(void); extern char * ExpandKadds(char *, char *); extern void SetParanoiaLevel(int); -extern void vsyslog(int pri, const char *fmt, va_list ap); +//TODO: remove? extern void vsyslog(int pri, const char *fmt, va_list ap); rsRetVal Syslog(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); #endif /* #ifndef IMKLOG_H_INCLUDED */ -- cgit v1.2.3 From f8dff16a4a1d606f41d738f7381649282c74ca25 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 14 Apr 2008 14:44:32 +0200 Subject: cleanup of imklog + addtl. config directives - implemented $KLogInternalMsgFacility config directive - implemented $KLogPermitNonKernelFacility config directive - modified internal interfaces --- plugins/imklog/imklog.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 2fea879f..a37ecc9e 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -39,6 +39,7 @@ rsRetVal klogLogKMsg(void); rsRetVal klogWillRun(void); rsRetVal klogAfterRun(void); +int klogFacilIntMsg(void); /* the following data members may be accessed by the "drivers" * I admit this is not the cleanest way to doing things, but I honestly @@ -52,6 +53,10 @@ extern char *symfile; extern int console_log_level; extern int dbgPrintSymbols; +/* the functions below may be called by the drivers */ +rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); +rsRetVal Syslog(int priority, uchar *msg); + /* prototypes */ extern int InitKsyms(char *); extern void DeinitKsyms(void); @@ -59,8 +64,6 @@ extern int InitMsyms(void); extern void DeinitMsyms(void); extern char * ExpandKadds(char *, char *); extern void SetParanoiaLevel(int); -//TODO: remove? extern void vsyslog(int pri, const char *fmt, va_list ap); -rsRetVal Syslog(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); #endif /* #ifndef IMKLOG_H_INCLUDED */ /* vi:set ai: -- cgit v1.2.3 From d9b0c77d3e719d4c08361e62f3b067228c30f6a9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 16 Apr 2008 15:27:53 +0200 Subject: some more cleanup reduced dependencies, moved non-runtime files to its own directory except for some whom's status is unclear --- plugins/imklog/imklog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index a37ecc9e..0847140b 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -28,7 +28,7 @@ #define IMKLOG_H_INCLUDED 1 #include "rsyslog.h" -#include "syslogd.h" +#include "dirty.h" /* interface to "drivers" * the platform specific drivers must implement these entry points. Only one -- cgit v1.2.3 From 2275a915e02ca4fd1cd1b3c450b0089ae98bc907 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 24 Nov 2008 17:48:12 +0100 Subject: bugfix: imklog did not compile on freeBSD --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 0847140b..37bd58b0 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -58,6 +58,7 @@ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(pri rsRetVal Syslog(int priority, uchar *msg); /* prototypes */ +extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */ extern int InitKsyms(char *); extern void DeinitKsyms(void); extern int InitMsyms(void); -- cgit v1.2.3 From ba4806a70439dd24dc98bd707893b1319dd5e3ef Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 18 Jun 2009 13:51:17 -0400 Subject: add support for KLogPath --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 37bd58b0..c183026d 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -52,6 +52,7 @@ extern int symbol_lookup; extern char *symfile; extern int console_log_level; extern int dbgPrintSymbols; +extern uchar *pszPath; /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); -- cgit v1.2.3 From a9223031a6effeaf3673beb752c12a29f5e8f83d Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 25 May 2011 14:04:14 +0200 Subject: step: imklog (linux) moved to v2 config system --- plugins/imklog/imklog.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index c183026d..447211dc 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -30,22 +30,37 @@ #include "rsyslog.h" #include "dirty.h" +/* we need to have the modConf type present in all submodules */ +struct modConfData_s { + int dbgPrintSymbols; + int symbols_twice; + int use_syscall; + int symbol_lookup; + int bPermitNonKernel; + int iFacilIntMsg; + uchar *pszPath; + int console_log_level; + char *symfile; + rsconf_t *pConf; +}; + /* interface to "drivers" * the platform specific drivers must implement these entry points. Only one * driver may be active at any given time, thus we simply rely on the linker * to resolve the addresses. * rgerhards, 2008-04-09 */ -rsRetVal klogLogKMsg(void); -rsRetVal klogWillRun(void); -rsRetVal klogAfterRun(void); -int klogFacilIntMsg(void); +rsRetVal klogLogKMsg(modConfData_t *pModConf); +rsRetVal klogWillRun(modConfData_t *pModConf); +rsRetVal klogAfterRun(modConfData_t *pModConf); +int klogFacilIntMsg(); /* the following data members may be accessed by the "drivers" * I admit this is not the cleanest way to doing things, but I honestly * believe it is appropriate for the job that needs to be done. * rgerhards, 2008-04-09 */ +#if 0 extern int symbols_twice; extern int use_syscall; extern int symbol_lookup; @@ -53,6 +68,7 @@ extern char *symfile; extern int console_log_level; extern int dbgPrintSymbols; extern uchar *pszPath; +#endif /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); @@ -60,7 +76,7 @@ rsRetVal Syslog(int priority, uchar *msg); /* prototypes */ extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */ -extern int InitKsyms(char *); +extern int InitKsyms(modConfData_t*); extern void DeinitKsyms(void); extern int InitMsyms(void); extern void DeinitMsyms(void); -- cgit v1.2.3 From 47729f3b9362f7956c936088ac4bb703633cb33b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 24 Jun 2011 17:07:11 +0200 Subject: added support for obtaining timestamp for kernel message from message If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation. --- plugins/imklog/imklog.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index c183026d..39bdeb5c 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -5,7 +5,7 @@ * Major change: 2008-04-09: switched to a driver interface for * several platforms * - * Copyright 2007-2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -56,7 +56,7 @@ extern uchar *pszPath; /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); -rsRetVal Syslog(int priority, uchar *msg); +rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); /* prototypes */ extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */ -- cgit v1.2.3 From 0b5980df018f39af270de26f7a1b94d963a827db Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 21 Jan 2012 17:41:15 +0100 Subject: licensing change --- plugins/imklog/imklog.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index c183026d..22f10053 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -5,24 +5,23 @@ * Major change: 2008-04-09: switched to a driver interface for * several platforms * - * Copyright 2007-2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see . - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef IMKLOG_H_INCLUDED #define IMKLOG_H_INCLUDED 1 -- cgit v1.2.3 From cb2a78b30bf55fd3d356cad7048b9e70968dbb95 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 29 Jun 2012 12:42:08 +0200 Subject: imklog: support for module() global config parameters added --- plugins/imklog/imklog.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 7f6c810a..a9b22b4f 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -31,16 +31,19 @@ /* we need to have the modConf type present in all submodules */ struct modConfData_s { + /* DEAD */ int dbgPrintSymbols; int symbols_twice; int use_syscall; int symbol_lookup; - int bPermitNonKernel; + char *symfile; + /* end DEAD */ + rsconf_t *pConf; int iFacilIntMsg; uchar *pszPath; int console_log_level; - char *symfile; - rsconf_t *pConf; + sbool bPermitNonKernel; + sbool configSetViaV2Method; }; /* interface to "drivers" @@ -54,21 +57,6 @@ rsRetVal klogWillRun(modConfData_t *pModConf); rsRetVal klogAfterRun(modConfData_t *pModConf); int klogFacilIntMsg(); -/* the following data members may be accessed by the "drivers" - * I admit this is not the cleanest way to doing things, but I honestly - * believe it is appropriate for the job that needs to be done. - * rgerhards, 2008-04-09 - */ -#if 0 -extern int symbols_twice; -extern int use_syscall; -extern int symbol_lookup; -extern char *symfile; -extern int console_log_level; -extern int dbgPrintSymbols; -extern uchar *pszPath; -#endif - /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); -- cgit v1.2.3 From 5a993ad7425bce33380ff10308f2ae93dadf8dae Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 29 Jun 2012 12:59:46 +0200 Subject: imklog: removal of no longer needed config directives --- plugins/imklog/imklog.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index a9b22b4f..acfb50ab 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -31,13 +31,6 @@ /* we need to have the modConf type present in all submodules */ struct modConfData_s { - /* DEAD */ - int dbgPrintSymbols; - int symbols_twice; - int use_syscall; - int symbol_lookup; - char *symfile; - /* end DEAD */ rsconf_t *pConf; int iFacilIntMsg; uchar *pszPath; -- cgit v1.2.3 From fa4119e8747eaec739e38e600cae0308db5367e9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 17 Oct 2012 17:17:43 +0200 Subject: imklog: add paramter "keepkerneltimestamp" Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on. --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index acfb50ab..6cd97c37 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -36,6 +36,7 @@ struct modConfData_s { uchar *pszPath; int console_log_level; sbool bPermitNonKernel; + sbool bKeepKernelStamp; /* keep kernel timestamp instead of interpreting it */ sbool configSetViaV2Method; }; -- cgit v1.2.3 From 318a6fb577a6e5af558b70232bb0a19871399d13 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 21 Nov 2012 13:46:58 +0100 Subject: imklog: added $klogKeepKernelTimestamp option When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too. --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 7a060df4..03fb9735 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -52,6 +52,7 @@ extern char *symfile; extern int console_log_level; extern int dbgPrintSymbols; extern uchar *pszPath; +extern int bKeepKernelStamp; /* the functions below may be called by the drivers */ rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); -- cgit v1.2.3 From f040bde7a0454dfbc7def36a288bc70c58d878af Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 21 Nov 2012 13:47:19 +0100 Subject: imklog: added $klogParseKernelTimestamp option When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time. --- plugins/imklog/imklog.h | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/imklog/imklog.h') diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 03fb9735..c93a53b5 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -52,6 +52,7 @@ extern char *symfile; extern int console_log_level; extern int dbgPrintSymbols; extern uchar *pszPath; +extern int bParseKernelStamp; extern int bKeepKernelStamp; /* the functions below may be called by the drivers */ -- cgit v1.2.3