Changeset 7655:5b58d16b39cb

Timestamp:

11/09/07 00:00:02 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Server details.

Location:

sage/dsage

Files:

• scripts/dsage_server.py (modified) (1 diff)
• server/server.py (modified) (1 diff)
• web/index.html (modified) (2 diffs)
• web/static/dsage_web.css (modified) (2 diffs)
• web/static/dsage_web.js (modified) (1 diff)
• web/web_server.py (modified) (4 diffs)

sage/dsage/scripts/dsage_server.py

@@ -237 +237 @@
     from twisted.web2 import server, http, resource, channel, static
     from sage.dsage.web.web_server import Toplevel, GetJobDetails
-    top_level = Toplevel(dsage_server)
+    top_level = Toplevel(dsage_server, SERVER_PORT)
     # top_level.putChild(GetJobDetails(dsage_server))
     site = server.Site(top_level)

sage/dsage/server/server.py

@@ -529 +529 @@
         doc, gauge = create_gauge(doc)
         
-        add_totalAgentCount(doc, gauge)
         add_onlineAgentCount(doc, gauge)
         add_offlineAgentCount(doc, gauge)
         add_availableAgentCount(doc, gauge)
         add_unavailableAgentCount(doc, gauge)
+        add_totalAgentCount(doc, gauge)
         add_workingAgentCount(doc, gauge)
         add_workingAgentPercentage(doc, gauge)
-
         add_onlineProcessorCount(doc, gauge)
-        add_offlineAgentCount(doc, gauge)
         add_availableProcessorCount(doc, gauge)
         add_unavailableProcessorCount(doc, gauge)

sage/dsage/web/index.html

@@ -18 +18 @@
     <div id='page'>
             <div id='header'>
-                Distributed SAGE
+                Distributed SAGE (%s:%s)
             </div>
             <center>
@@ -38 +38 @@
                 <table id='jobs_table' class='tablesorter' display='none'>
                 </table>
-                <div id='server_details' display='none'>
-                </div>
+                <table id='server_details' display='none'>
+                </table>
                 <table id='job_details' class='tablesorter' display='none'>
                 </table>

sage/dsage/web/static/dsage_web.css

@@ -32 +32 @@
 }
 
-#server_stats {
-    padding-left: 60%;
-    font-size:10px;
-}
-
 #title {
     font-size:24px;
@@ -53 +48 @@
 
 #server_details {
-    text-align: center;
+    font-size:14px;
+    width:50%;
+    color: #3D3D3D;
+        vertical-align: top;
+        margin-left: auto;
+        margin-right: auto;
+}
+
+#key {
+    font-size: 16px;
+    font-style: italic;
+}
+
+#server_title {
+    font-size: 24px;
+}
+
+#help {
+    font-size: 12px;
 }
 

sage/dsage/web/static/dsage_web.js

@@ -2 +2 @@
 
 function getServerDetails () {
-    $('#server_details').load('get_server_details');
+    $('#server_details').load('get_server_details', function() {
+                                    $("#server_details").tablesorter(); });
     showServer()
 }

sage/dsage/web/web_server.py

@@ -21 +21 @@
 import sqlite3
 from cStringIO import StringIO
+import socket
 
 from twisted.web2 import http, resource
@@ -80 +81 @@
     addSlash = True
     
-    def __init__(self, dsage_server):
+    def __init__(self, dsage_server, server_port):
         self.dsage_server = dsage_server  
-    
+        self.server_port = server_port
+        
     def child_static(self, ctx):
         return static.File(STATIC)
@@ -102 +104 @@
         
     def render(self, ctx):
-        return static.File(INDEX)
+        index = open(INDEX).read() % (socket.getfqdn(), self.server_port)
+        # return static.File(StringIO(index))
+        return http.Response(stream=index)
 
 class GetHelp(resource.PostableResource):
@@ -233 +237 @@
                                            XML)
         
+        mapping = {'onlineAgentCount': 'Online Workers',
+                   'offlineAgentCount': 'Offline Workers',
+                   'totalAgentCount': 'Total Workers',
+                   'onlineProcessorCount': 'Online CPUs',
+                   'workingProcessorCount': 'Working CPUs',
+                   'workingAgentPercentage': 'Working %'}
         # html = """
-        #     <thead>
-        #         <th>Server</th>
-        #         <th>Workers Online</th>
-        #         <th>Workers Offline</th>
-        #         <th>Total Workers</th>
-        #         <th>Working MHz</th>
-        #         <th>Total MHz</th>
-        #     </thead>
-        #     <tbody>
-        #     <tr>
-        #         <td></td>
-        #         <td></td>
-        #         <td></td>
-        #     </tr>
-        #     </tbody>
+        # <thead>
+        # <tr>
+        #    <th>Online Workers</th>
+        #    <th>Offline Workers</th>
+        #    <th>Total Workers</th>
+        #    <th>Online Processors</th>
+        #    <th>Working Processors</th>
+        #    <th>Working MHz</th>
+        #    <th>Percent Working</th>
+        # </tr>
+        # </thead>
+        # <tbody>
         # """
-                
-        html = """
-        """
-        
+        # 
+        html = """"""
         # build StringIO object
         tree = ET()
         tree.parse(StringIO(stats_xml))
         root = tree.getroot()
-        for elem in root.getchildren():
-            html += '%s: %s <br>' % (elem.tag, elem.text)
+        for i, elem in enumerate(root.getchildren()):      
+            if elem.tag in ('onlineAgentCount', 
+                            'offlineAgentCount', 
+                            'totalAgentCount',
+                            'onlineProcessorCount',
+                            'workingProcessorCount',
+                            'workingAgentPercentage'):
+                html += """
+                <tr>
+                    <td id='key'>%s</td>
+                    <td>%s</td>
+                </tr>
+                """ % (mapping[elem.tag], elem.text)
+
+        # html += """
+        # </tbody>
+        # """
         
         return html