Changeset 44:525b66828fb2

Timestamp:

08/07/08 09:52:59 (4 months ago)

Author:

Jeffrey Gelens <jeffrey@…>

Branch:

default

Message:

Implemented Error notifications

Files:

• collector/models.py (modified) (4 diffs)
• collector/views.py (modified) (3 diffs)
• templates/collector/server.html (modified) (1 diff)

collector/models.py

@@ -34 +34 @@
     uptime = models.IntegerField(editable=False, null=True)
     updated_at = models.DateTimeField(auto_now=True, editable=False, null=True)
-    outbound_updates = models.BooleanField(default=True)
+    pull_updates = models.BooleanField(default=True)
     type = models.CharField(max_length=4, choices=MONITOR_DAEMONS)
 
@@ -113 +113 @@
             try:
                 data = server._open(url)
-            except urllib2.HTTPError, urllib2.URLError: 
-                return False
+            except urllib2.HTTPError, errmessage:
+                return (False, errmessage)
+            except urllib2.URLError, errmessage: 
+                return (False, errmessage)
             xml = ElementTree.parse(data).getroot()
         elif data != "":
             xml = ElementTree.fromstring(data)
         else:
-            return False
+            return (True, 'ok')
 
         server.version = xml.findtext('server/version')
@@ -153 +155 @@
             monitor.pending = int(monitor_node.findtext('pendingaction'))
             monitor.save()
-        return True
+        return (True, 'ok')
 
     def call_monitor(self, server, monitor, command):
@@ -171 +173 @@
         """
         url = server.url + "%s?action=%s" % (monitor, command)
-        try:
-            server._open(url)
-        except IOError:
-            return False
-        return True
+        #try:
+        #server._open(url)
+        #except IOError:
+        #    return False
+        #return True
+        return server._open(url)
 
 

collector/views.py

@@ -26 +26 @@
 
     # Request server data if needed
-    if (server.outbound_updates):
+    if (server.pull_updates):
         if (datetime.now() - server.updated_at).seconds > 60:
-            server.update()
-            server.save()
-            flash_date = True
+            update_ok = server.update()
+            if update_ok[0]:
+                server.save()
+                flash_date = True
+            else:
+                message = "Could not update server: %s" % update_ok[1]
 
     if request.REQUEST.has_key('val'):
@@ -78 +81 @@
 
     server = MonitorDaemon.objects.get(pk=int(id))
-    if server.update():
+    update_ok = server.update()
+    if update_ok[0]:
         server.save()
         return HttpResponseRedirect("/servers/%s" % (id))
     else:
-        return get_server(request, id, message="Could not update server")
+        return get_server(request, id, message="Could not update server: %s" % update_ok[1])
 
 @login_required
@@ -144 +148 @@
         if request.POST.has_key("server"):
             server = MonitorDaemon.objects.get(pk=int(request.POST.get("server")))
-            if server.outbound_updates:
+            if server.pull_updates:
                 server.update()
         else:
             servers = MonitorDaemon.objects.all()
             for server in servers:
-                if server.outbound_updates:
+                if server.pull_updates:
                     server.update()
 

templates/collector/server.html

@@ -54 +54 @@
 
 {% if server %}
+{% if message %}
+<div id="warning">{{ message }}</div>
+{% endif %}
 <form action="/servers/{{ server.id }}/" method="post" id="search">
 {% endif %}