A little cludge to make the simple test in the README work again... Need to update the event parsing structure.

Author: Matt Luckcuck

README.md

@@ -102,7 +102,7 @@ The config file sets the following parameters:
 
 ### Quick Check
 
-As a quick check that Varanus is installed correctly, you can enter the `varanus` root directly and run `python varanus-python/varanus.py offline-test rosmon-test/hibye.yaml` (assuming your `python` command points to Python 2.x) to run a very simple check on a simple process. If all is well, you should see `INFO:varanus:Trace file finished with no violations` at the end of the output to the terminal. 
+As a quick check that Varanus is installed correctly, you can enter the `varanus` root directly and run `python varanus-python/varanus.py offline rosmon-test/hibye.yaml` (assuming your `python` command points to Python 2.x) to run a very simple check on a simple process. If all is well, you should see `INFO:varanus:Trace file finished with no violations` at the end of the output to the terminal. 
 
 Lets look at the config file we've just checked:
 

varanus-python/monitor.py

@@ -140,7 +140,10 @@ def run_offline_state_machine(self, main_process, trace_path):
         result = {}
 
         # Extract the Traces and start the loop
-        self.monitored_system = OfflineInterface(trace_path, self.event_map)
+        if trace_path =="rosmon-test/hello_goodbye.json":
+            self.monitored_system = OfflineInterface(trace_path, self.event_map, simple = True)
+        else:
+            self.monitored_system = OfflineInterface(trace_path, self.event_map)
         is_connected = self.monitored_system.connect()
         if not is_connected:
             varanus_logger.error("Could not parse trace_file at: " + trace_path)
@@ -150,6 +153,7 @@ def run_offline_state_machine(self, main_process, trace_path):
         #transition_times = []
         #number_of_events = 0
         varanus_logger.info("Checking trace file: " + trace_path)
+        print (self.monitored_system.has_event())
         passed = True
         while self.monitored_system.has_event():
             varanus_logger.debug("self.event_map is None = " + str(self.event_map is None))

varanus-python/system_interface.py

@@ -1,4 +1,6 @@
 import socket
+from pkgutil import simplegeneric
+
 from websocket_server import WebsocketServer
 from trace_representation import Event, Trace
 from mascot_event_abstractor import MascotEventAbstractor
@@ -139,26 +141,35 @@ def parse_simple_ROSMon_event(self, json_line):
 class OfflineInterface(SystemInterface):
     """ Interface to a file of traces."""
 
-    def __init__(self, trace_file_path, event_map=None):
+    def __init__(self, trace_file_path, event_map=None, simple =False):
         SystemInterface.__init__(self) # Python is a silly language. I have to manually make inheritance work...
         self.trace_file_path = trace_file_path
         self._file_open = False
         self.event_map = event_map
         self.events = deque()
         self.trace_file = None
+        self.simple=simple
 
     def connect(self):
         varanus_logger.info("Parsing trace file at: " + self.trace_file_path)
         try:
             self.trace_file = open(self.trace_file_path)
             self._file_open = True
+
             line_num = 0
             for json_line in self.trace_file:
+
                 line_num += 1
                 if json_line == '\n':
+
                     continue
                 try:
-                    event = self.parse_ROSMon_event(json_line)
+                    # TODO This is messy, needs better structure for individual parsing methods
+                    if self.simple:
+                        event = self.parse_simple_ROSMon_event(json_line)
+                    else:
+                        event = self.parse_ROSMon_event(json_line)
+
                     if event is not None:
                         self.events.append(event)
                 except ValueError as e:

varanus-python/varanus.py

@@ -95,7 +95,7 @@
 ################
 # set to the name of the scenario
 logFileName = CHECK_NAME
-log_level = logging.DEBUG
+log_level = logging.INFO
 
 if not os.path.exists(LOG_PATH):
     os.mkdir(LOG_PATH)
@@ -217,7 +217,7 @@ def run(check_type):
         continue_monitoring = mon.check_monitorable(MAIN_PROCESS, ALPHABET, set(COMMON_ALPHA))
 
         if continue_monitoring:
-            varanus_logger.error("+++ starting monitoring against" + MAIN_PROCESS + " +++")
+            varanus_logger.info("+++ starting monitoring against " + MAIN_PROCESS + " +++")
             check_start = time.time()
             mon.run_offline_state_machine(MAIN_PROCESS, TRACE_FILE)
             check_end = time.time()