Changeset 1060

Timestamp:

09/20/06 16:27:25 (7 years ago)

Author:

mglb1

Message:

Fixed bugs with fetching the MOTD

• Fetch the MOTD via an Ajax call
• Add a configuration parameter to completely disable fetching the MOTD

Until we get a multi-threaded server fetching the MOTD from a server
that is unavailable has the potential to block the entire server for
up to 2 minutes, which is rather unpleasant.

Fixes #30

Location:

ccsd

Files:

• private/resources/rurallink.js (modified) (1 diff)
• trunk/crcnetd/_utils/ccsd_cfengine.py (modified) (1 diff)
• trunk/crcnetd/modules/ccs_monitor_web.py (modified) (7 diffs)
• trunk/resources/homepage.js (added)

ccsd/private/resources/rurallink.js

@@ -70 +70 @@
 };
 Behaviour.register(myrules);
-Behaviour.addLoadEvent(initialisePage);
+mvBehaviour.addLoadEvent(initialisePage);
 
 function doAjaxWizard() {

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -1119 +1119 @@
     # PHP sends in an associative array we want the values only
     hosts = hosts.values()
+    print hosts
 
     # Loop through the specified hosts and mark them as pending

ccsd/trunk/crcnetd/modules/ccs_monitor_web.py

@@ -28 +28 @@
 from crcnetd._utils.ccsd_clientserver import registerPage, registerDir, \
         registerRealm
-from crcnetd._utils.ccsd_config import config_get, init_pref_store, pref_get
+from crcnetd._utils.ccsd_config import config_get, init_pref_store, pref_get, \
+        config_getboolean
 from crcnetd.version import ccsd_version, ccsd_revision
 
@@ -332 +333 @@
 # Content Pages
 ##############################################################################
-def displayMOTD(request):
+@registerPage("/motd")
+def getMOTD(request, method):
     """Returns HTML to display the Message of the Day"""
     
@@ -340 +342 @@
             DEFAULT_MOTD_REFRESH)
     motdURL = config_get("www", "motdURL", DEFAULT_MOTD_URL)
+    fetchMotd = config_getboolean("www", "fetch_motd", False)
     updateNote = ""
     
@@ -347 +350 @@
         mtime = -1
 
-    if mtime == -1 or time.time()-mtime > motdRefreshInterval or \
-            request.query.find("refreshMotd=true") != -1:
+    if (mtime == -1 or time.time()-mtime > motdRefreshInterval or \
+            request.query.find("refreshMotd=true") != -1) and fetchMotd:
         # Get new MOTD
         try:
@@ -366 +369 @@
             mtime = -1
     else:
-        fd = open(motdFile, "r")
-        motd = fd.read()
-        fd.close()
-
+        try:
+            fd = open(motdFile, "r")
+            motd = fd.read()
+            fd.close()
+        except:
+            motd = "No news available"
+        
     # Calculate how long till next update
     if mtime != -1:
@@ -378 +384 @@
 
     # Generate the output
-    output = """<div class="content">
-<h2>Latest News <span class="note">%s&nbsp;
+    output = """<h2>Latest News <span class="note">%s&nbsp;
 <a href="/?refreshMotd=true">[Refresh Now]</a>
 </span>
 </h2><br />
 %s
-</div>
 """ % (updateNote, motd.replace("\n", "<br />"))
-    
-    return output
+
+    length = len(output)
+    request.send_response(200)
+    request.send_header("Length", length)
+    request.end_headers()
+    request.wfile.write(output)
+    request.finish()
+    return
 
 @registerPage("/")
 def homepage(request, method):
     
-    output = ""
+    output = """<div class="content" id="motd">"""
     
     # MOTD at the top
-    output += displayMOTD(request)
+    output += "<h2>Loading Latest News...</h2><br />"
+    output += "Please wait while the latest news is retrieved."
+    output += "</div>"
     
     # Try and load the status summary from the status module
@@ -412 +424 @@
 """ % status
 
-    returnPage(request, "CPE Navigation", output)
+    returnPage(request, "CPE Navigation", output, 
+            scripts=["/resources/homepage.js"])
 
 @registerPage("/contact")