csbackntfy: gracefully skip ill-formatted log lines

csbackntfy.py

@@ -276,24 +276,24 @@ def main(argv=None):
             timeStamp=dt.datetime.strptime(str(now.year)+" "+" ".join(str(n) 
               for n in line.split()[0:3]),"%Y %b %d %H:%M:%S")
           except:
-            logger.getLogger().error("Error while parsing log line: '%s'" % line)
-            raise Error("Error while parsing log line from file %s" %  path,
-              eCodes.GLOBAL_UnhandledException)
-          if 'CRITICAL' in line:
-            if timeStamp > timeLimit:
-              criticalList.append("logfile: "+path+"\n"+line) 
-          elif 'ERROR' in line:
-            if timeStamp > timeLimit:
-              errorList.append("logfile: "+path+"\n"+line)
-          elif 'WARNING' in line:
-            if timeStamp > timeLimit:
-              warningDeque.appendleft("logfile: "+path+"\n"+line)
-          elif 'INFO' in line:
-            infoDeque.appendleft("logfile: "+path+"\n"+line)
+            logger.getLogger().error("Error while parsing log line: '%s'" 
+                                      % line)
           else:
-            logger.getLogger().info("Illegal line in logfile found")
-            logger.getLogger().info("  Line does not contain any of the csback message level keywords")
-            logger.getLogger().info("  The log line is:  '%s'" % line)
+            if 'CRITICAL' in line:
+              if timeStamp > timeLimit:
+                criticalList.append("logfile: "+path+"\n"+line) 
+            elif 'ERROR' in line:
+              if timeStamp > timeLimit:
+                errorList.append("logfile: "+path+"\n"+line)
+            elif 'WARNING' in line:
+              if timeStamp > timeLimit:
+                warningDeque.appendleft("logfile: "+path+"\n"+line)
+            elif 'INFO' in line:
+              infoDeque.appendleft("logfile: "+path+"\n"+line)
+            else:
+              logger.getLogger().info("Illegal line in logfile found")
+              logger.getLogger().info("  Line does not contain any of the csback message level keywords")
+              logger.getLogger().info("  The log line is:  '%s'" % line)
     except IOError as err:
       raise Error("Error while reading logfiles: "+err.filename, \
           eCodes.NTFY_IOError)