Re-enable pubsub/events

Author: avivace

main.py

@@ -34,7 +34,7 @@
 from program import ProgramEngine, Program
 from config import Config
 from cnn_manager import CNNManager
-#from event import EventManager
+from event import EventManager
 from conversation import Conversation
 
 from flask import Flask, render_template, request, send_file, Response, jsonify
@@ -386,7 +386,7 @@ def run_server():
                 logging.error("Camera not present")
 
             #cnn = CNNManager.get_instance()
-            #event = EventManager.get_instance("coderbot")
+            event = EventManager.get_instance("coderbot")
             conv = Conversation.get_instance()
 
             if app.bot_config.get('load_at_start') and len(app.bot_config.get('load_at_start')):

program.py

@@ -29,7 +29,7 @@
 import motion
 import config
 import audio
-#import event
+import event
 import conversation
 
 PROGRAM_PATH = "./data/"
@@ -51,8 +51,8 @@ def get_audio():
 def get_prog_eng():
     return ProgramEngine.get_instance()
 
-#def get_event():
-#    return event.EventManager.get_instance()
+def get_event():
+    return event.EventManager.get_instance()
 
 def get_conv():
     return conversation.Conversation.get_instance()
@@ -180,12 +180,12 @@ def run(self):
             logging.info("quit: " + str(e))
             get_prog_eng().log(str(e))
         finally:
-            #try:
-            #    get_event().wait_event_generators()
-            #    get_event().unregister_listeners()
-            #    get_event().unregister_publishers()
-            #except:
-            #    logging.error("error polishing event system")
+            try:
+                get_event().wait_event_generators()
+                get_event().unregister_listeners()
+                get_event().unregister_publishers()
+            except:
+                logging.error("error polishing event system")
             try:
                 get_cam().video_stop() #if video is running, stop it
                 get_motion().stop()