Merge pull request ggeop#14 from ggeop/logging_dev

Logging dev

Author: ggeop

src/jarvis/config.conf

@@ -1,12 +1,12 @@
 import sys
 import os
 import traceback
-import logging.config
+import logging
+from logging import config
 from google_speech import Speech
 from subprocess import call
-from jarvis.settings import GOOGLE_SPEECH
 
-from jarvis.settings import GENERAL_SETTINGS
+from jarvis.settings import GOOGLE_SPEECH, GENERAL_SETTINGS, LOG_SETTINGS
 
 
 Jarvis_logo = ""\
@@ -29,27 +29,21 @@ class OutputStyler:
     UNDERLINE = '\033[4m'
 
 
-# Relative path to configuration file
-jarvis_path = os.path.dirname(os.path.abspath(__file__))
-config_path = os.path.join(jarvis_path, '..', 'config.conf')
-
-logging.config.fileConfig(fname=config_path, disable_existing_loggers=False)
-logger = logging.getLogger(__name__)  # Create logger
+# Create a Console & Rotating file logger
+config.dictConfig(LOG_SETTINGS)
 
 
 def log(func):
     def wrapper(*args, **kwargs):
         try:
-            logger.debug(func.__name__)
+            logging.debug(func.__name__)
             func(*args, **kwargs)
         except Exception as e:
-            logger.error(func.__name__)
+            logging.error(func.__name__)
             traceback.print_exc(file=sys.stdout)
-
     return wrapper
 
 
-@log
 def assistant_response(text):
     """
     Assistant response in voice or/and in text
@@ -64,7 +58,7 @@ def assistant_response(text):
 
 
 def user_speech_playback(text):
-    user_speech = str(OutputStyler.GREEN + 'You: ' + text)
+    user_speech = str(OutputStyler.GREEN + 'You: ' + text + '\n')
     sys.stdout.write(OutputStyler.BLUE + user_speech + OutputStyler.ENDC)
 
 

src/jarvis/jarvis/assistant_utils.py

@@ -21,6 +21,7 @@ def __init__(self):
         self.r = sr.Recognizer()
         self.words = None
 
+    @log
     def run(self):
         self.words = self._get_words()
         commands = self._get_commands()
@@ -37,7 +38,6 @@ def wake_up_check(self):
             self.words = self.r.recognize_google(audio).lower()
         except sr.UnknownValueError:
             self.words = self._get_words()
-
         if TRIGGERING_WORDS['enable_jarvis'] in self.words:
             self._wake_up_response()
             return True
@@ -51,6 +51,7 @@ def shutdown_check(self):
         """
         if TRIGGERING_WORDS['disable_jarvis'] in self.words:
             assistant_response('Bye bye Sir. Have a nice day')
+            logging.debug('Application terminated gracefully.')
             sys.exit()
 
     @staticmethod
@@ -78,10 +79,11 @@ def _get_commands(self):
         words_set = set(words)
         return commands_set.intersection(words_set)
 
+    @log
     def _execute_commands(self, commands):
         """
         Execute iteratively all the commands in the input dict.
-        :param commands: dict (e.g {'open', 'search'})
+        :param commands: set (e.g {'open', 'search'})
         """
         if bool(commands):
             for command in commands:
@@ -112,4 +114,5 @@ def _record(self):
             self.r.pause_threshold = SPEECH_RECOGNITION['pause_threshold']
             self.r.adjust_for_ambient_noise(source, duration=SPEECH_RECOGNITION['ambient_duration'])
             audio_text = self.r.listen(source)
+
         return audio_text

src/jarvis/jarvis/command_manager.py

@@ -1,3 +1,33 @@
+LOG_SETTINGS = {
+    'version': 1,
+    'root': {
+        'level': 'DEBUG',
+        'handlers': ['console', 'file'],
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'level': 'INFO',
+            'formatter': 'detailed',
+            'stream': 'sys.stdout',
+        },
+        'file': {
+            'class': 'logging.handlers.RotatingFileHandler',
+            'level': 'DEBUG',
+            'formatter': 'detailed',
+            'filename': '/var/log/jarvis.log',
+            'mode': 'a',
+            'maxBytes': 10000000,
+            'backupCount': 3,
+        },
+    },
+    'formatters': {
+        'detailed': {
+            'format': '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        },
+    }
+}
+
 
 # General assistant settings
 GENERAL_SETTINGS = {