gnue-appserver/src geasRpcServer.py

[Jan Ischebeck]

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

Modified files:
        src            : geasRpcServer.py 

Log message:
        change appserver command line parsing to support new gnue.common.rpc
        driver structure

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

Patches:
Index: gnue-appserver/src/geasRpcServer.py
diff -c gnue-appserver/src/geasRpcServer.py:1.27 
gnue-appserver/src/geasRpcServer.py:1.28
*** gnue-appserver/src/geasRpcServer.py:1.27    Mon Sep 29 18:28:58 2003
--- gnue-appserver/src/geasRpcServer.py Tue Oct  7 10:50:06 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasRpcServer.py,v 1.27 2003/09/29 22:28:58 reinhard Exp $
  
  from gnue.appserver import VERSION
  from gnue.appserver import geasSessionManager
--- 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
***************
*** 50,57 ****
    COMMAND_OPTIONS = [
      [ 'rpctype',None,'rpc-type',1,None, 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
!       _("for <type> are 'xmlrpc' and '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 ')+
--- 50,57 ----
    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 ')+
***************
*** 106,121 ****
    def phaseInit (self):
      rpctype = gConfig ("rpctype")
  
!     if rpctype == "xmlrpc":
        port = gConfig ("rpcport")
!       print "Exporting our services via xmlrpc (port %s) ..." % port
!       self.setTransports ({'xmlrpc':
!                            {'port': int (port),
!                             'allowed_hosts': gConfig ('allowed_hosts')}})
! 
!     elif rpctype == "pw_xmlrpc":
!       port = gConfig ("rpcport")
!       print "Exporting our services via pw_xmlrpc (port %s) ..." % port
        params = {'port': int (port),
                  'allowed_hosts': gConfig ('allowed_hosts')}
  
--- 106,114 ----
    def phaseInit (self):
      rpctype = gConfig ("rpctype")
  
!     if rpctype in ('xmlrpc','xmlrpc.pw_xmlrpc','xmlrpc.py_xmlrpc'):
        port = gConfig ("rpcport")
!       print "Exporting our services via %s (port %s) ..." % (rpctype,port)
        params = {'port': int (port),
                  'allowed_hosts': gConfig ('allowed_hosts')}
  
***************
*** 124,130 ****
                      '/status': self.htmlStatus}
          params.update ({'httpbind': httpbind})
  
!       self.setTransports({'pw_xmlrpc': params})
  
      elif rpctype == "sockets":
        # Sockets not working yet
--- 117,123 ----
                      '/status': self.htmlStatus}
          params.update ({'httpbind': httpbind})
  
!       self.setTransports({rpctype: params})
  
      elif rpctype == "sockets":
        # Sockets not working yet