Changeset 1181

Timestamp:

12/11/06 16:50:14 (6 years ago)

Author:

mglb1

Message:

• Added extra logging to time how long it takes to render a full request separately from its execution time
• Add flags and configuration options to turn off SSL for testing purposes

Location:

ccsd/trunk

Files:

• crcnetd/_utils/ccsd_server.py (modified) (6 diffs)
• scripts/ccsd-console (modified) (4 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_server.py

@@ -207 +207 @@
         ccsd_xmlrpc.prof_dir = config_get(None, "profile_dir", \
                 DEFAULT_PROFILE_DIR)
+        use_ssl = config_getboolean(None, "use_ssl", True)
 
         # Port and logfile
@@ -263 +264 @@
         # Pass off control to Twisted's mainloop
         threadable.init()
-        reactor.listenSSL(port, server.Site(_root, logfile), \
-                SCF(key, cert, cacert))
+        if use_ssl:
+            reactor.listenSSL(port, server.Site(_root, logfile), \
+                    SCF(key, cert, cacert))
+        else:
+            reactor.listenTCP(port, server.Site(_root, logfile))
         reactor.addSystemEventTrigger("before", "shutdown", shutdownHandler)
         log_info("Server Started. Ready to serve requests...")
@@ -393 +397 @@
         * Dispatches requests to the appropriate function that was earlier
           registered via exportViaXMLRPC
-        """           
+        """
+        rstart = time.time()
         # We import this here to avoid a circular reference
         from ccsd_session import isSessionValid, getSessionE, \
@@ -417 +422 @@
                     prof.stop()
                     prof.close()
+                if self.log_times:        
+                    log_debug("Rendered %s in %0.3f seconds" % \
+                        (func["name"], (time.time()-rstart)))
                 return server.NOT_DONE_YET
 
@@ -428 +436 @@
                     prof.stop()
                     prof.close()
+                if self.log_times:        
+                    log_debug("Rendered %s in %0.3f seconds" % \
+                        (func["name"], (time.time()-rstart)))
                 return server.NOT_DONE_YET
             
@@ -480 +491 @@
             prof.stop()
             prof.close()
+        if self.log_times:
+            log_debug("Rendered %s in %0.3f seconds" % \
+                    (func["name"], (time.time()-rstart)))
         return server.NOT_DONE_YET
             

ccsd/trunk/scripts/ccsd-console

@@ -32 +32 @@
 # Get hostname, certificates from the commandline
 if len(sys.argv) < 4:
-    sys.stderr.write("Usage: %s <server> <key> <cert>\n" % 
+    sys.stderr.write("Usage: %s [-S] <server> <key> <cert>\n" % 
             sys.argv[0])
     sys.exit(1)
 
+use_ssl = True
+if sys.argv[1] == "-S":
+    use_ssl = False
+    sys.argv[1:] = sys.argv[2:]
 server = sys.argv[1]
 key = sys.argv[2]
@@ -44 +48 @@
     """XMLRPC Transport to create an HTTPS connection using client certs"""
 
+    def __init__(self, use_ssl=True):
+        self._use_ssl = use_ssl
+
     def make_connection(self, host):
         """Overrides the standard make_connection method
@@ -51 +58 @@
         
         host, extra_headers, x509 = self.get_host_info(host)
-        try:
-            HTTPS = httplib.HTTPS
-        except AttributeError:
-            raise NotImplementedError(
-                "your version of httplib doesn't support HTTPS"
-            )
+        if self._use_ssl:
+            try:
+                HTTPS = httplib.HTTPS
+            except AttributeError:
+                raise NotImplementedError(
+                        "your version of httplib doesn't support HTTPS"
+                    )
+            else:
+                return HTTPS(host, None, key_file=key, cert_file=cert);
         else:
-            return HTTPS(host, None, key_file=key, cert_file=cert);
+            return httplib.HTTP(host, None)
 
     def request(self, host, handler, request_body, verbose=0):
         start = time.time()
         rv = xmlrpclib.Transport.request(self, host, handler, request_body, verbose)
-        end = time.time()
-        sys.stdout.write("Request returned in %.4f seconds\n" % (end-start))
+        sys.stdout.write("Request parsed in %.4f seconds\n" % (time.time()-start))
         return rv
 
@@ -87 +96 @@
 
 # Connect to the server 
-s = xmlrpclib.ServerProxy("https://%s/RPC2" % server, MyTransport())
+s = xmlrpclib.ServerProxy("https://%s/RPC2" % server, MyTransport(use_ssl))
 
 # Query to get the servers version, this acts as a check that a valid