gnue-appserver/src geasRpcServer.py testRPC.py

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/10/15 10:03:38

Modified files:
        src            : geasRpcServer.py testRPC.py 

Log message:
        support pyro as rpc drivers
        add pyro command line option to testRPC

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasRpcServer.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/testRPC.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue-appserver/src/geasRpcServer.py
diff -c gnue-appserver/src/geasRpcServer.py:1.28 
gnue-appserver/src/geasRpcServer.py:1.29
*** gnue-appserver/src/geasRpcServer.py:1.28    Tue Oct  7 10:50:06 2003
--- gnue-appserver/src/geasRpcServer.py Wed Oct 15 10:03:37 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.28 2003/10/07 14:50:06 siesel Exp $
  
  from gnue.appserver import VERSION
  from gnue.appserver import geasSessionManager
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.29 2003/10/15 14:03:37 siesel Exp $
  
  from gnue.appserver import VERSION
  from gnue.appserver import geasSessionManager
***************
*** 50,58 ****
    COMMAND_OPTIONS = [
      [ 'rpctype',None,'rpc-type',1,None, 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
!       _("for <type> are 'xmlrpc','xmlrpc.py_xmlrpc' and 'xmlrpc.pw_xmlrpc'.")+
!       _("For more information on GNURPC connection types have a look at ")+
!       _('common/doc/RPC-abstraction. ')],
      [ 'rpcport',None,'rpc-port',1,None, 'port',
        _('Set the GNURPC port. For more information on ')+
        _('GNURPC have a look at common/doc/RPC-abstraction. ')],
--- 50,58 ----
    COMMAND_OPTIONS = [
      [ 'rpctype',None,'rpc-type',1,None, 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
!       _("for <type> are 'xmlrpc','xmlrpc.py_xmlrpc', 'xmlrpc.pw_xmlrpc'")+
!       _("and 'pyro'. For more information on GNURPC connection types have ")+
!       _('a look at common/doc/RPC-abstraction. ')],
      [ 'rpcport',None,'rpc-port',1,None, 'port',
        _('Set the GNURPC port. For more information on ')+
        _('GNURPC have a look at common/doc/RPC-abstraction. ')],
***************
*** 118,123 ****
--- 118,127 ----
          params.update ({'httpbind': httpbind})
  
        self.setTransports({rpctype: params})
+ 
+     elif rpctype == "pyro":
+       print "Exporting our services via Pyro (EXPERIMENTAL!) ..."
+       self.setTransports ({'pyro':{}})
  
      elif rpctype == "sockets":
        # Sockets not working yet
Index: gnue-appserver/src/testRPC.py
diff -c gnue-appserver/src/testRPC.py:1.2 gnue-appserver/src/testRPC.py:1.3
*** gnue-appserver/src/testRPC.py:1.2   Mon Sep  1 14:01:45 2003
--- gnue-appserver/src/testRPC.py       Wed Oct 15 10:03:38 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: testRPC.py,v 1.2 2003/09/01 18:01:45 reinhard Exp $
  
  from gnue.common.rpc import GComm
  import test
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: testRPC.py,v 1.3 2003/10/15 14:03:38 siesel Exp $
  
  from gnue.common.rpc import GComm
  import test
***************
*** 29,34 ****
--- 29,43 ----
  # 
=============================================================================
  
  class testRpcApp (test.testApp):
+   # standart settings
+   type   = "xmlrpc"
+   params = {"host": "localhost",
+             "port": 8765,
+             "transport": "http" }
+ 
+   def setConnection(self,type,params):
+     self.type=type
+     self.params=params
  
    # 
---------------------------------------------------------------------------
    # Request a session manager object
***************
*** 36,45 ****
  
    def getSessionManager (self):
      print "Opening RPC connection ..."
!     params = {"host": "localhost",
!               "port": 8765,
!               "transport": "http" }
!     server = GComm.attach ("xmlrpc", params)
  
      print "Setup an link to the session manager"
      sm = server.request ("Session")
--- 45,51 ----
  
    def getSessionManager (self):
      print "Opening RPC connection ..."
!     server = GComm.attach (self.type, self.params)
  
      print "Setup an link to the session manager"
      sm = server.request ("Session")
***************
*** 51,55 ****
  # 
=============================================================================
  
  if __name__ == "__main__":
!   testRpcApp().run()
    print "Thank you for playing!"
--- 57,68 ----
  # 
=============================================================================
  
  if __name__ == "__main__":
!   import sys
!   app=testRpcApp()
! 
!   for i in sys.argv:
!     if i in ('pyro','--pyro','--rpc-type=pyro'):
!       app.setConnection('pyro',{})
!   
!   app.run()
    print "Thank you for playing!"