[gnue] r7889 - in trunk/gnue-appserver: samples/testing/benchmark scripts src src/language

[johannes]

Author: johannes
Date: 2005-09-06 12:37:55 -0500 (Tue, 06 Sep 2005)
New Revision: 7889

Modified:
   trunk/gnue-appserver/samples/testing/benchmark/modify.py
   trunk/gnue-appserver/scripts/gnue-appserver
   trunk/gnue-appserver/src/geasConfiguration.py
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-appserver/src/language/App.py
   trunk/gnue-appserver/src/test.py
   trunk/gnue-appserver/src/testRPC.py
Log:
Adapted to the changed rpc layer


Modified: trunk/gnue-appserver/samples/testing/benchmark/modify.py
===================================================================
--- trunk/gnue-appserver/samples/testing/benchmark/modify.py    2005-09-06 
17:37:17 UTC (rev 7888)
+++ trunk/gnue-appserver/samples/testing/benchmark/modify.py    2005-09-06 
17:37:55 UTC (rev 7889)
@@ -225,7 +225,7 @@
     f.close ()
 
   print "\n<Return> to continue" 
-  raw_input ()
+  # raw_input ()
 
 
 # =============================================================================
@@ -241,7 +241,7 @@
   try:
     session.setcontext ('benchmark')
 
-    theRange = xrange (200)
+    theRange = xrange (2000)
 
     a = processRecords (session, theRange, False, _insertFunction,
         "Insert new records", logfile)

Modified: trunk/gnue-appserver/scripts/gnue-appserver
===================================================================
--- trunk/gnue-appserver/scripts/gnue-appserver 2005-09-06 17:37:17 UTC (rev 
7888)
+++ trunk/gnue-appserver/scripts/gnue-appserver 2005-09-06 17:37:55 UTC (rev 
7889)
@@ -32,4 +32,4 @@
 if __name__ == '__main__':
   server = geasRpcServer.geasRpcServerApp ();
   server.phaseInit ();
-  server.run ();
+  server.run ()

Modified: trunk/gnue-appserver/src/geasConfiguration.py
===================================================================
--- trunk/gnue-appserver/src/geasConfiguration.py       2005-09-06 17:37:17 UTC 
(rev 7888)
+++ trunk/gnue-appserver/src/geasConfiguration.py       2005-09-06 17:37:55 UTC 
(rev 7889)
@@ -101,4 +101,12 @@
     'Description': _('Directory for webfrontend http documents'),
     'Typecast'   : GTypecast.text,
     'Default'    : "/this_dir_shouldn't exist." }, # default should be 
overridden
+  { 'Name'       : 'servertype',
+    'Type'       : 'Setting',
+    'Comment'    : _("Type of the HTTP server to use. Can be 'threading' or " \
+                     "'forking'"),
+    'Description': _("Type of the HTTP server to use. Can be 'threading' or " \
+                     "'forking'"),
+    'Typecast'   : GTypecast.text,
+    'Default'    : 'forking' },
 )

Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py   2005-09-06 17:37:17 UTC (rev 
7888)
+++ trunk/gnue-appserver/src/geasRpcServer.py   2005-09-06 17:37:55 UTC (rev 
7889)
@@ -25,6 +25,7 @@
 import os
 import sys
 import signal
+import thread
 
 import gnue.paths
 
@@ -160,7 +161,8 @@
       print u_("Exporting our services via %(rpctype)s (port %(port)s) ...") % 
\
                {"rpctype": rpctype, "port": port}
       params = {'port': int (port),
-                'allowed_hosts': gConfig ('allowed_hosts')}
+                'allowed_hosts': gConfig ('allowed_hosts'),
+                'servertype': gConfig ('servertype')}
 
       if self.OPTIONS ["web-frontend"]:
         httpbind = {'/': gConfig ('httpdir'),
@@ -206,10 +208,10 @@
       self.selftest ()
       return
 
-    # Create the various servers
-    servers = server.bind (gnue.paths.data + '/share/gnue/grpc/appserver.grpc',
-                           self._transports,
-                           {'SessionManager': self.requestSessionManager})
+    # Create a new SessionManager instance which will be served by the various
+    # transport adapters
+    service = self.requestSessionManager ()
+    servers = server.bind (self._transports, service)
 
     # be verbose
     print _("\n... GNUe Application Server up and running ...\n")
@@ -224,13 +226,14 @@
       pass
 
     # Start the server for the different protocolls
-    for key in servers.keys ():
-      servers [key].serveAsNewThread ()
+    for adapter in servers.values ():
+      thread.start_new_thread (adapter.serve, ())
 
     # wait for the servers shut down
     try:
-      while 1 == 1:
-        time.sleep (1999999)
+      while 1:
+        time.sleep (sys.maxint)
+
     except KeyboardInterrupt:
       print _("Appserver is shutting down....ok")
 
@@ -316,6 +319,6 @@
 # =============================================================================
 
 if __name__ == '__main__':
-  app = geasRpcServerApp ();
+  app = geasRpcServerApp ()
   app.phaseInit ()
   app.run ()

Modified: trunk/gnue-appserver/src/language/App.py
===================================================================
--- trunk/gnue-appserver/src/language/App.py    2005-09-06 17:37:17 UTC (rev 
7888)
+++ trunk/gnue-appserver/src/language/App.py    2005-09-06 17:37:55 UTC (rev 
7889)
@@ -86,5 +86,4 @@
                'port'     : cparams.get ('port', 8765),
                'transport': cparams.get ('transport', 'http')}
 
-    server = client.attach (rpctype, params)
-    return server.request ('Session')
+    return client.attach (rpctype, params)

Modified: trunk/gnue-appserver/src/test.py
===================================================================
--- trunk/gnue-appserver/src/test.py    2005-09-06 17:37:17 UTC (rev 7888)
+++ trunk/gnue-appserver/src/test.py    2005-09-06 17:37:55 UTC (rev 7889)
@@ -54,6 +54,10 @@
     return sm
 
 
+  def _ok (self):
+    print "Ok"
+    raw_input ()
+
   # ---------------------------------------------------------------------------
   # Main program
   # ---------------------------------------------------------------------------
@@ -62,19 +66,19 @@
 
     print "Opening session ...",
     session = sm.open ({"user":"hacker", "password":"secret"})
-    print "Ok"
+    self._ok ()
 
     print "Creating and populating list object ...",
     list = sm.request (session, "address_person", [], ["address_zip"],
                        ["address_name", "address_street", "address_city",
                         "address_country.address_code",
                         "address_country.address_name"])
-    print "Ok"
+    self._ok ()
 
     print "Retrieving first instance ...",
     rset = sm.fetch (session,list,0,1)
     first_id = rset[0][0]
-    print "Ok"
+    self._ok ()
 
     print "These are the values of the first instance:"
     print "  Name   :", rset[0][1]
@@ -84,7 +88,7 @@
 
     print "Retrieving second instance ...",
     rset = sm.fetch (session,list,1,1)
-    print "Ok"
+    self._ok ()
 
     print "These are the values of the second instance:"
     print "  Name   :", rset[0][1]
@@ -94,14 +98,14 @@
 
     print "Executing rollback to clear cache ...",
     sm.rollback (session)
-    print "Ok"
+    self._ok ()
 
     print "Loading the first instance with load () ...",
     rset = sm.load (session, "address_person", [first_id],
                     ["address_name", "address_street", "address_city",
                      "address_country.address_code",
                      "address_country.address_name"])
-    print "Ok"
+    self._ok ()
 
     print "These are again the values of the first instance:"
     print "  Name   :", rset[0][0]
@@ -117,7 +121,7 @@
 
     print "Committing and closing session ...",
     sm.close (session, 1)
-    print "Ok"
+    self._ok ()
 
 
 

Modified: trunk/gnue-appserver/src/testRPC.py
===================================================================
--- trunk/gnue-appserver/src/testRPC.py 2005-09-06 17:37:17 UTC (rev 7888)
+++ trunk/gnue-appserver/src/testRPC.py 2005-09-06 17:37:55 UTC (rev 7889)
@@ -21,7 +21,8 @@
 #
 # $Id$
 
-from gnue.common.rpc import GComm
+from gnue.common.rpc import client
+
 import test
 
 # =============================================================================
@@ -32,7 +33,7 @@
   # standart settings
   type   = "xmlrpc"
   params = {"host": "localhost",
-            "port": 8765,
+            "port": 4711,
             "transport": "http" }
 
   def setConnection(self,type,params):
@@ -45,13 +46,9 @@
 
   def getSessionManager (self):
     print "Opening RPC connection ..."
-    server = GComm.attach (self.type, self.params)
+    return client.attach (self.type, self.params)
 
-    print "Setup an link to the session manager"
-    sm = server.request ("Session")
 
-    return sm
-
 # =============================================================================
 # Let it rock
 # =============================================================================