ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/WEBCONDDB/CondWebServer/server.py
(Generate patch)

Comparing COMP/WEBCONDDB/CondWebServer/server.py (file contents):
Revision 1.18 by xiezhen, Thu Dec 11 17:20:38 2008 UTC vs.
Revision 1.26 by xiezhen, Tue Jun 16 16:54:16 2009 UTC

# Line 4 | Line 4 | import cherrypy
4   from optparse import OptionParser
5   import DLFCN
6   sys.setdlopenflags(DLFCN.RTLD_GLOBAL+DLFCN.RTLD_LAZY)
7 < from Applications import iovInspect, iovExport, payload, globaltag,serviceMap
7 > from Applications import iovInspect, iovExport, globaltag,serviceMap,luminosityApp
8   from Common import config
9 < from pluginCondDBPyInterface import *
10 <
9 > #from pluginCondDBPyInterface import *
10 > os.environ["QUIET_ASSERT"]='yes'
11   class Root(object):
12      @cherrypy.expose
13      def index(self):
# Line 19 | Line 19 | class Server(object):
19      def __init__(self):
20          self.__hostname='localhost'
21          self.__port=6789
22 <        self.__configfile='application.conf'
23 <
22 >        self.__appconfigfile='application.conf'
23 >        self.__detconfigfile='detector.conf'
24      def start (self):
25          """Start server
26          """
# Line 29 | Line 29 | class Server(object):
29                            help="port default 6789")      
30          parser.add_option("--hostname",action="store",dest="hostname",
31                            help="hostname default localhost")      
32 <        parser.add_option("--configfile",action="store",dest="configfile",
33 <                          help="configuration file default application.conf")
32 >        parser.add_option("--configdir",action="store",dest="configdir",
33 >                          help="configuration dir. Default to currentdir/config")
34          (options, args) = parser.parse_args()
35          if options.hostname:
36              self.__hostname=options.hostname.strip(' ')
37          if options.port:
38              self.__port=int(options.port)
39 <        #if options.configfile:
40 <        #    self.__configfile = options.configfile.strip(' ')
41 <        
39 >        if options.configdir:
40 >            self.__configdir = options.configdir.strip(' ')
41 >        else:
42 >            currentdir=os.path.dirname(os.path.abspath(__file__))
43 >            self.__configdir = os.path.join(currentdir,'config')
44          serverconfig={'global':{'server.socket_host':self.__hostname,'server.socket_port':self.__port,'server.environment':'production'}}
45          cherrypy.config.update(serverconfig)
46          cherrypy.tree.mount(Root(),script_name='/')
45        currentdir=os.path.dirname(os.path.abspath(__file__))
46        appconfigfile=os.path.join(currentdir,'config','application.conf')
47  
48          # here for the time being
49          self.__config=config.Config()
50 <        self.__config.from_ini(appconfigfile)
51 <        self.__authpath=self.__config.common.auth_path
52 <        os.environ["CORAL_AUTH_PATH"] = self.__authpath
53 <        print "auth path ", os.environ["CORAL_AUTH_PATH"]
54 <        # this one shall be alive all the time...
55 <        self.__cmsframe = FWIncantation
56 <        
57 <        cherrypy.tree.mount(iovInspect.IOV(appconfigfile),script_name='/iov')
58 <        cherrypy.tree.mount(iovExport.IOV(appconfigfile),script_name='/exportIov')
59 <        detconfigfile=os.path.join(currentdir,'config','detector.conf')
60 <        #print 'detconfigfile',detconfigfile
61 <        cherrypy.tree.mount(serviceMap.serviceMap(detconfigfile),script_name='/serviceMap')
62 <        cherrypy.tree.mount(globaltag.GlobalTag(appconfigfile),script_name='/globaltag')
50 >        self.__config.from_ini(os.path.join(self.__configdir,self.__appconfigfile))
51 >        cherrypy.tree.mount(iovInspect.IOV(os.path.join(self.__configdir,self.__appconfigfile)),script_name='/iov')
52 >        cherrypy.tree.mount(iovExport.IOV(os.path.join(self.__configdir,self.__appconfigfile)),script_name='/exportIov')
53 >        cherrypy.tree.mount(serviceMap.serviceMap(os.path.join(self.__configdir,self.__detconfigfile)),script_name='/serviceMap')
54 >        cherrypy.tree.mount(globaltag.GlobalTag(os.path.join(self.__configdir,self.__appconfigfile)),script_name='/globaltag')
55 >        cherrypy.tree.mount(luminosityApp.lumi(os.path.join(self.__configdir,self.__appconfigfile)),script_name='/lumi')
56          cherrypy.server.quickstart()
57          cherrypy.engine.start()
58  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines