From 2953e6dc81a0c32c8c45e3db12cdb9b65a4a0137 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Wed, 3 Jul 2013 18:18:59 +0200 Subject: Fixed Datetime detection --- plugins/impstats/statslog-splitter.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/impstats/statslog-splitter.py') diff --git a/plugins/impstats/statslog-splitter.py b/plugins/impstats/statslog-splitter.py index 6a6870bf..3452e3b3 100755 --- a/plugins/impstats/statslog-splitter.py +++ b/plugins/impstats/statslog-splitter.py @@ -101,10 +101,11 @@ elif bSingleObjectOutput: # Found valid logline, save into file! if len(result) >= loglineindexes[iLogRegExIndex]["LN_LOGDATA"] and result[ loglineindexes[iLogRegExIndex]["LN_SYSLOGTAG"] ] == "rsyslogd-pstats": # Convert Datetime! - if isinstance( result[ loglineindexes[iLogRegExIndex]["LN_MONTH"] ], int ): - filedate = datetime.datetime.strptime(result[ loglineindexes[iLogRegExIndex]["LN_MONTH"] ] + " " + str(datetime.datetime.now().year) + " " + result[ loglineindexes[iLogRegExIndex]["LN_DAY"] ] + " " + result[ loglineindexes[iLogRegExIndex]["LN_TIME"] ] ,"%b %Y %d %H:%M:%S") - else: + try: + iMonth = int( result[ loglineindexes[iLogRegExIndex]["LN_MONTH"] ] ) filedate = datetime.datetime.strptime(result[ loglineindexes[iLogRegExIndex]["LN_MONTH"] ] + " " + str(datetime.datetime.now().year) + " " + result[ loglineindexes[iLogRegExIndex]["LN_DAY"] ] + " " + result[ loglineindexes[iLogRegExIndex]["LN_TIME"] ] ,"%m %Y %d %H:%M:%S") + except ValueError: + filedate = datetime.datetime.strptime(result[ loglineindexes[iLogRegExIndex]["LN_MONTH"] ] + " " + str(datetime.datetime.now().year) + " " + result[ loglineindexes[iLogRegExIndex]["LN_DAY"] ] + " " + result[ loglineindexes[iLogRegExIndex]["LN_TIME"] ] ,"%b %Y %d %H:%M:%S") # Split logdata into Array aProperties = result[ loglineindexes[iLogRegExIndex]["LN_LOGDATA"] ].split(" ") -- cgit v1.2.3