]> www.vanbest.org Git - motioneye-debian/commitdiff
make_media_folders: ignore non local motion cameras
authorCalin Crisan <ccrisan@gmail.com>
Fri, 27 Nov 2015 19:35:30 +0000 (21:35 +0200)
committerCalin Crisan <ccrisan@gmail.com>
Sun, 29 Nov 2015 10:10:13 +0000 (12:10 +0200)
motioneye/config.py
motioneye/server.py

index d056171696e1fc83a1fc99245b76b4f3e1cf9f5b..de42747ac9ec01c57fd55ed52e78dc93ed7c5f6b 100644 (file)
@@ -1423,7 +1423,6 @@ def restore(content):
             io_loop.add_timeout(datetime.timedelta(seconds=2), later)
 
         else:
-            logging.info('invalidating config cache')
             invalidate()
 
         return {'reboot': settings.ENABLE_REBOOT}
index abb637c32b10eb78f7ed8ac58cdf274b6427421b..0c8af20bbd142facef1a088b9750aac6b30e2a29 100644 (file)
@@ -298,13 +298,14 @@ def make_media_folders():
     camera_ids = config.get_camera_ids()
     for camera_id in camera_ids:
         camera_config = config.get_camera(camera_id)
-        if not os.path.exists(camera_config['target_dir']):
-            try:
-                os.makedirs(camera_config['target_dir'])
-            
-            except Exception as e:
-                logging.error('failed to create root media folder "%s" for camera with id %s: %s' % (
-                        camera_config['target_dir'], camera_id, e))
+        if 'target_dir' in camera_config:
+            if not os.path.exists(camera_config['target_dir']):
+                try:
+                    os.makedirs(camera_config['target_dir'])
+                
+                except Exception as e:
+                    logging.error('failed to create root media folder "%s" for camera with id %s: %s' % (
+                            camera_config['target_dir'], camera_id, e))
 
 
 def start_motion():