From 01ae87c918254425dbf4d1a00cf3d0327c1eea76 Mon Sep 17 00:00:00 2001
From: JHCD <github@jhc.de>
Date: Wed, 1 Jul 2015 22:04:06 +0200
Subject: [PATCH] solve some bugs - solve issue #35 - some bugs in logging
 errors - move check subprocesses in include-file

---
 boswatch.py                   | 35 ++++++++++++-----------
 includes/checkSubprocesses.py | 54 +++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 includes/checkSubprocesses.py

diff --git a/boswatch.py b/boswatch.py
index b0759fa..13f1f29 100755
--- a/boswatch.py
+++ b/boswatch.py
@@ -28,6 +28,7 @@ from includes import globals  # Global variables
 from includes import MyTimedRotatingFileHandler  # extension of TimedRotatingFileHandler 
 from includes import converter  # converter functions
 from includes import signalHandler  # TERM-Handler for use script as a daemon
+from includes import checkSubprocesses  # check startup of the subprocesses
 		
 
 #
@@ -55,7 +56,9 @@ except SystemExit:
 	# -h or --help called, exit right now
 	exit(0)
 except:
-	print "cannot parsing the arguments"
+	# we couldn't work without arguments -> exit
+	print "ERROR: cannot parsing the arguments"
+	exit(1)
 
 	
 #
@@ -85,14 +88,20 @@ try:
 		#
 		if not os.path.exists(globals.log_path):
 			os.mkdir(globals.log_path)
-			
-		#
-		# Create new myLogger...
-		#
+	except:
+		# we couldn't work without logging -> exit
+		print "ERROR: cannot initialize paths"
+		exit(1)
+
+	#
+	# Create new myLogger...
+	#
+	try:
 		myLogger = logging.getLogger()
 		myLogger.setLevel(logging.DEBUG)
 		# set log string format
-		formatter = logging.Formatter('%(asctime)s - %(module)-15s %(funcName)-15s [%(levelname)-8s] %(message)s', '%d.%m.%Y %H:%M:%S')
+		#formatter = logging.Formatter('%(asctime)s - %(module)-15s %(funcName)-15s [%(levelname)-8s] %(message)s', '%d.%m.%Y %H:%M:%S')
+		formatter = logging.Formatter('%(asctime)s - %(module)-15s [%(levelname)-8s] %(message)s', '%d.%m.%Y %H:%M:%S')
 		# create a file logger
 		fh = MyTimedRotatingFileHandler.MyTimedRotatingFileHandler(globals.log_path+"boswatch.log", "midnight", interval=1, backupCount=999)
 		# Starts with log level >= Debug
@@ -114,8 +123,7 @@ try:
 		
 	except:
 		# we couldn't work without logging -> exit
-		logging.critical("cannot create logger")
-		logging.debug("cannot create logger", exc_info=True)
+		print "ERROR: cannot create logger"
 		exit(1)
 		
 	# initialization of the logging was fine, continue...
@@ -132,6 +140,7 @@ try:
 		mon_log.close()
 		logging.debug("BOSWatch has started")
 		logging.debug("Logfiles cleared")		
+		
 	except:
 		# It's an error, but we could work without that stuff...
 		logging.error("cannot clear Logfiles")	
@@ -283,10 +292,7 @@ try:
 			# rtl_fm doesn't self-destruct, when an error occurs
 			# wait a moment to give the subprocess a chance to write the logfile
 			time.sleep(3)
-			rtlLog = open(globals.log_path+"rtl_fm.log","r").read()
-			if ("Failed" in rtlLog) or ("error" in rtlLog):
-				logging.debug("\n%s", rtlLog)
-				raise OSError("starting rtl_fm returns an error")
+			checkSubprocesses.checkRTL()
 		else:
 			logging.warning("!!! Test-Mode: rtl_fm not started !!!")
 	except:
@@ -313,10 +319,7 @@ try:
 			# multimon-ng  doesn't self-destruct, when an error occurs
 			# wait a moment to give the subprocess a chance to write the logfile
 			time.sleep(3)
-			multimonLog = open(globals.log_path+"multimon.log","r").read()
-			if ("invalid" in multimonLog) or ("error" in multimonLog):
-				logging.debug("\n%s", multimonLog)
-				raise OSError("starting multimon-ng  returns an error")
+			checkSubprocesses.checkMultimon()
 		else:
 			logging.warning("!!! Test-Mode: multimon-ng not started !!!")
 	except:
diff --git a/includes/checkSubprocesses.py b/includes/checkSubprocesses.py
new file mode 100644
index 0000000..120d4f6
--- /dev/null
+++ b/includes/checkSubprocesses.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+# -*- coding: cp1252 -*-
+#
+"""
+Functions for checking the subprocesses rtl_fm and multimon-ng
+Used in boswatch.py at startup and designated for watching-service
+
+@author: 		Jens Herrmann	
+"""
+
+import logging
+
+from includes import globals  # Global variables
+
+
+def checkRTL():
+	"""
+	check startup of rtl_fm
+
+	@exception: OSError when rtl_fm returns an error
+	@exception: Exception when checkRTL throws an unexpected error
+	"""
+	try:
+		rtlLog = open(globals.log_path+"rtl_fm.log","r").read()
+		if ("exiting" in rtlLog) or  ("Failed to open" in rtlLog):
+			logging.debug("\n%s", rtlLog)
+			raise OSError("starting rtl_fm returns an error")
+	except OSError:
+		raise
+	except:
+		# we couldn't work without rtl_fm
+		logging.critical("cannot check rtl_fm.log")
+		logging.debug("cannot check rtl_fm.log", exc_info=True)
+		raise
+		
+def checkMultimon():
+	"""
+	check startup of multimon-ng
+
+	@exception: OSError when multimon-ng returns an error
+	@exception: Exception when checkMultimon throws an unexpected error
+	"""
+	try:
+		multimonLog = open(globals.log_path+"multimon.log","r").read()
+		if ("invalid" in multimonLog) or ("error" in multimonLog):
+			logging.debug("\n%s", multimonLog)
+			raise OSError("starting multimon-ng returns an error")
+	except OSError:
+		raise
+	except:
+		# we couldn't work without multimon-ng
+		logging.critical("cannot check multimon.log")
+		logging.debug("cannot check multimon.log", exc_info=True)
+		raise
\ No newline at end of file