From: Calin Crisan <ccrisan@gmail.com>
Date: Fri, 19 Jun 2015 19:38:12 +0000 (+0300)
Subject: test_requirements is called now a bit later
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=c621d90990e6866e5538287b14cbed22c3d8582d;p=motioneye-debian

test_requirements is called now a bit later
---

diff --git a/motioneye.py b/motioneye.py
index 394847a..0a72083 100755
--- a/motioneye.py
+++ b/motioneye.py
@@ -204,6 +204,7 @@ def _test_requirements():
     import v4l2ctl
     has_v4lutils = v4l2ctl.find_v4l2_ctl() is not None
     
+    import smbctl
     has_mount_cifs = smbctl.find_mount_cifs() is not None
     
     ok = True
@@ -305,6 +306,7 @@ def _run_server():
     import thumbnailer
     import tornado.ioloop
     import server
+    import smbctl
 
     server.application.listen(settings.PORT, settings.LISTEN)
     logging.info('server started')
@@ -381,19 +383,20 @@ def _start_thumbnailer():
 
 if __name__ == '__main__':
     cmd = _configure_settings()
-    
-    import smbctl
 
-    if not _test_requirements():
-        sys.exit(-1)
-    
     _configure_signals()
     _configure_logging()
+    
+    if not _test_requirements():
+        sys.exit(-1)
+
     _configure_tornado()
     
     logging.info('hello! this is motionEye %s' % VERSION)
     
     if settings.SMB_SHARES:
+        import smbctl
+
         stop, start = smbctl.update_mounts()
         if start:
             _start_motion()