various logging & error reporting improvements

diff --git a/doc/todo.txt b/doc/todo.txt
index 79e2361fae8bf2a269af0f6a97ee8bfa1d73217c..e5c0277452f519843764b16e2627cf1b10eff318 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,6 +1,4 @@
 
--> cache configuration
-
 -> prevent Request closed errors by stopping mjpg clients before stopping motion
 
 -> style scroll bars

diff --git a/src/handlers.py b/src/handlers.py
index 2343c03b3c3e3c66dda69dc46ea954c684cb931a..574125f89d312f382c67b6af24f529612c4a5737 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -142,7 +142,7 @@ class ConfigHandler(BaseHandler):
             if camera_config['@proto'] != 'v4l2':
                 def on_response(remote_ui_config):
                     if remote_ui_config is None:
-                        return self.finish_json({'error': True})
+                        return self.finish_json({'error': 'Failed to get remote camera configuration.'})
                     
                     tmp_config = self._camera_ui_to_dict(remote_ui_config)
                     tmp_config.update(camera_config)
@@ -312,7 +312,7 @@ class ConfigHandler(BaseHandler):
         if host:  # remote listing
             def on_response(cameras):
                 if cameras is None:
-                    self.finish_json({'error': True})
+                    self.finish_json({'error': 'Failed to list remote cameras.'})
                     
                 else:
                     self.finish_json({'cameras': cameras})
@@ -333,7 +333,13 @@ class ConfigHandler(BaseHandler):
             def on_response_builder(camera_id, camera_config):
                 def on_response(remote_ui_config):
                     if remote_ui_config is None:
-                        length[0] -= 1
+                        #length[0] -= 1
+                        cameras.append({
+                            'id': camera_id,
+                            'name': '<error>',
+                            'enabled': False,
+                            'streaming_framerate': 1
+                        })
                     
                     else:
                         remote_ui_config['id'] = camera_id

diff --git a/static/css/ui.css b/static/css/ui.css
index f54b56c766726b9d34d1407b288db1e2c680d6e4..4bcbb172cd23cb2e3e0890f58ff929486108434d 100644 (file)
--- a/static/css/ui.css
+++ b/static/css/ui.css
@@ -367,7 +367,7 @@ span.dialog-item-label {
 div.popup-message-container {
     position: fixed;
     display: none;
-    z-index: 9999;
+    z-index: 10002;
     background-color: #313131;
     border-radius: 3px;
     opacity: 0;

diff --git a/templates/main.html b/templates/main.html
index e8e6894835fec5e0afc766e49dcabca335a3569e..6dc0b00d61ec62eaf54038171b81f56cb20dc730 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -424,7 +424,7 @@
             copyright © Calin Crisan 2013
         </div> 
     </div>
-    <div class="popup-message-container"></div>
     <div class="modal-glass"></div>
     <div class="modal-container"></div>
+    <div class="popup-message-container"></div>
 {% endblock %}