From 2f23747fcef42017b79120c181849b50ab4cf48a Mon Sep 17 00:00:00 2001 From: arjen Date: Fri, 19 Oct 2007 07:22:12 +0000 Subject: [PATCH] When extracting the service name for a log entry, the '/' character is not considered part of that name. --- src/gcm_input/irix_syslog_cooker.cpp | 12 ++++++++---- src/gcm_input/syslog_cooker.cpp | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/gcm_input/irix_syslog_cooker.cpp b/src/gcm_input/irix_syslog_cooker.cpp index d71d7c0..2797bfe 100644 --- a/src/gcm_input/irix_syslog_cooker.cpp +++ b/src/gcm_input/irix_syslog_cooker.cpp @@ -8,7 +8,7 @@ *********************** ** FILE NAME : irix_syslog_cooker.cpp ** SYSTEM NAME : -** VERSION NUMBER : $Revision: 1.3 $ +** VERSION NUMBER : $Revision: 1.4 $ ** ** DESCRIPTION : Cooks IRIX system log lines ** @@ -26,7 +26,11 @@ /***************************** $Log: irix_syslog_cooker.cpp,v $ - Revision 1.3 2007-01-11 13:51:40 arjen + Revision 1.4 2007-10-19 07:22:12 arjen + When extracting the service name for a log entry, the '/' character + is not considered part of that name. + + Revision 1.3 2007/01/11 13:51:40 arjen The '-' character is part of the service name. Revision 1.2 2004/01/13 12:20:13 arjen @@ -44,7 +48,7 @@ *****************************/ -/* static const char *RCSID = "$Id: irix_syslog_cooker.cpp,v 1.3 2007-01-11 13:51:40 arjen Exp $"; */ +/* static const char *RCSID = "$Id: irix_syslog_cooker.cpp,v 1.4 2007-10-19 07:22:12 arjen Exp $"; */ #include @@ -92,7 +96,7 @@ bool irix_syslog_cooker::cook_this(String logline, UTC arrival) // Extract the service rest <<= i + 1; - for (i = 0; (isalpha(rest[i]) || rest[i] == '/' || rest[i] == '.' || rest[i] == '-') && i < ~rest; i++); + for (i = 0; (isalpha(rest[i]) || rest[i] == '.' || rest[i] == '-') && i < ~rest; i++); srv = rest(0, i); return true; diff --git a/src/gcm_input/syslog_cooker.cpp b/src/gcm_input/syslog_cooker.cpp index 2547c6d..4624da9 100644 --- a/src/gcm_input/syslog_cooker.cpp +++ b/src/gcm_input/syslog_cooker.cpp @@ -8,7 +8,7 @@ *********************** ** FILE NAME : syslog_cooker.cpp ** SYSTEM NAME : -** VERSION NUMBER : $Revision: 1.3 $ +** VERSION NUMBER : $Revision: 1.4 $ ** ** DESCRIPTION : Cooks system log lines ** @@ -26,7 +26,11 @@ /***************************** $Log: syslog_cooker.cpp,v $ - Revision 1.3 2007-01-11 13:51:40 arjen + Revision 1.4 2007-10-19 07:22:12 arjen + When extracting the service name for a log entry, the '/' character + is not considered part of that name. + + Revision 1.3 2007/01/11 13:51:40 arjen The '-' character is part of the service name. Revision 1.2 2004/01/13 12:20:12 arjen @@ -44,7 +48,7 @@ *****************************/ -/* static const char *RCSID = "$Id: syslog_cooker.cpp,v 1.3 2007-01-11 13:51:40 arjen Exp $"; */ +/* static const char *RCSID = "$Id: syslog_cooker.cpp,v 1.4 2007-10-19 07:22:12 arjen Exp $"; */ #include @@ -92,7 +96,7 @@ bool syslog_cooker::cook_this(String logline, UTC arrival) // Extract the service rest <<= i + 1; - for (i = 0; (isalpha(rest[i]) || rest[i] == '/' || rest[i] == '.' || rest[i] == '-') && i < ~rest; i++); + for (i = 0; (isalpha(rest[i]) || rest[i] == '.' || rest[i] == '-') && i < ~rest; i++); srv = rest(0, i); return true; -- 2.11.0