Set loglevel at least to info during diagnose run and add '--diagnose' argument to jasper.py

2 files changed, 14 insertions, 1 deletions

diff --git a/client/diagnose.py b/client/diagnose.py
index 0483c22..acbec5e 100755
--- a/client/diagnose.py
+++ b/client/diagnose.py
@@ -98,6 +98,11 @@ class DiagnosticRunner(object):
         self._logger = logging.getLogger(__name__)
 
     def run(self):
+        # Set loglevel of this module least to info
+        loglvl = self._logger.getEffectiveLevel()
+        if loglvl == logging.NOTSET or loglvl > logging.INFO:
+            self._logger.setLevel(logging.INFO)
+
         self._logger.info("Starting jasper diagnostic at %s",
                           time.strftime("%c"))
         self._logger.info("Git revision: %r", get_git_revision())
@@ -141,5 +146,6 @@ class DiagnosticRunner(object):
 if __name__ == '__main__':
     logging.basicConfig(stream=sys.stdout)
     logger = logging.getLogger()
-    logger.setLevel(logging.DEBUG if '--debug' in sys.argv else logging.INFO)
+    if '--debug' in sys.argv:
+        logger.setLevel(logging.DEBUG)
     DiagnosticRunner().run()
diff --git a/jasper.py b/jasper.py
index 5061510..1e3484b 100755
--- a/jasper.py
+++ b/jasper.py
@@ -20,6 +20,8 @@ parser.add_argument('--local', action='store_true',
                     help='Use text input instead of a real microphone')
 parser.add_argument('--no-network-check', action='store_true',
                     help='Disable the network connection check')
+parser.add_argument('--diagnose', action='store_true',
+                    help='Run diagnose and exit')
 parser.add_argument('--debug', action='store_true', help='Show debug messages')
 args = parser.parse_args()
 
@@ -135,6 +137,11 @@ if __name__ == "__main__":
         logger.warning("Network not connected. This may prevent Jasper from " +
                        "running properly.")
 
+    if args.diagnose:
+        diag = diagnose.DiagnosticRunner()
+        failed_checks = diag.run()
+        sys.exit(0 if not failed_checks else 1)
+
     try:
         app = Jasper()
     except Exception: