From a15859d86df70b551331eb188edea11d73dd3038 Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Tue, 23 Feb 2010 18:40:56 +0100 Subject: fix init script Signed-off-by: Nikola Pajkovsky --- abrt.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.init b/abrt.init index b4ff7d3f..151f7939 100644 --- a/abrt.init +++ b/abrt.init @@ -44,7 +44,7 @@ start() { check # Check if it is already running - if [ ! -f $LOCK || ! -f $OLD_LOCK ]; then + if [ ! -f $LOCK ] && [! -f $OLD_LOCK ]; then echo -n $"Starting abrt daemon: " daemon $ABRT_BIN RETVAL=$? -- cgit From 556fb0e4ae095dd6df8d0105afc44cb5f1a2c62b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 23 Feb 2010 18:55:05 +0100 Subject: partial fix for bz#565983 Signed-off-by: Denys Vlasenko --- lib/Plugins/KerneloopsSysLog.cpp | 7 +++++-- src/Hooks/dumpoops.cpp | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Plugins/KerneloopsSysLog.cpp b/lib/Plugins/KerneloopsSysLog.cpp index e6de84aa..29e9d6f3 100644 --- a/lib/Plugins/KerneloopsSysLog.cpp +++ b/lib/Plugins/KerneloopsSysLog.cpp @@ -127,6 +127,9 @@ int extract_oopses(vector_string_t &oopses, char *buffer, size_t buflen) /* in /var/log/messages, we need to strip the first part off, upto the 3rd ':' */ /* 01234567890123456 */ +// Gaack! Some users run syslog in non-C locale: +// 2010-02-22T09:24:08.156534-08:00 gnu-4 gnome-session[2048]: blah blah +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ !!! if ((c9 - c) > sizeof("Jul 4 11:11:11 ") && c[3] == ' ' && (c[4] == ' ' || isdigit(c[4])) @@ -234,7 +237,7 @@ next_line: oopsstart = i; else if (strstr(curline, "NETDEV WATCHDOG")) oopsstart = i; - else if (strstr(curline, "WARNING:") + else if (strstr(curline, "WARNING: at ") /* WARN_ON() generated message */ && !strstr(curline, "appears to be on the same physical disk") ) { oopsstart = i; @@ -317,7 +320,7 @@ next_line: else if (strstr(curline, "Instruction dump:")) oopsend = i; /* if a new oops starts, this one has ended */ - else if (strstr(curline, "WARNING: at ") && oopsstart != i) /* WARN_ON() generated messages */ + else if (strstr(curline, "WARNING: at ") && oopsstart != i) /* WARN_ON() generated message */ oopsend = i-1; else if (strstr(curline, "Unable to handle") && oopsstart != i) oopsend = i-1; diff --git a/src/Hooks/dumpoops.cpp b/src/Hooks/dumpoops.cpp index 0467b51d..ae926198 100644 --- a/src/Hooks/dumpoops.cpp +++ b/src/Hooks/dumpoops.cpp @@ -89,7 +89,8 @@ int main(int argc, char **argv) LOADSYM(plugin_newf, "plugin_new"); LOADSYM(scan_syslog_file, "scan_syslog_file"); LOADSYM(save_oops_to_debug_dump, "save_oops_to_debug_dump"); - CKerneloopsScanner* scanner = (CKerneloopsScanner*) plugin_newf(); + +// CKerneloopsScanner* scanner = (CKerneloopsScanner*) plugin_newf(); // scanner->Init(); // scanner->LoadSettings(path); -- cgit