Projet

Général

Profil

0001-Allow-an-extra-section-in-w.c.s.-configuration-files.patch

Benjamin Dauvergne, 20 mars 2015 22:19

Télécharger (2,42 ko)

Voir les différences: 

Subject: [PATCH] Allow an [extra] section in w.c.s. configuration files


 wcs/ctl/start.py  | 2 +-
 wcs/publisher.py  | 8 ++++----
 wcs/qommon/ctl.py | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)
wcs/ctl/start.py
71 71 
        run_kwargs['port'] = int(sub_options.port)
72 72 
        run_kwargs['spawn_cron'] = True
73 73 
        run_function = qommon.scgi_server.run
74 
        publisher.WcsPublisher.configure(self.config, sub_options.extra)
74 
        publisher.WcsPublisher.configure(self.config)
75 75 
        if sub_options.handler_connection_limit:
76 76 
            run_kwargs['handler_connection_limit'] = int(sub_options.handler_connection_limit)
77 77 
        elif self.config.has_option('main', 'handler_connection_limit'):
wcs/publisher.py
89 89 
        return admin
90 90 
    get_admin_module = classmethod(get_admin_module)
91 91 

  		




  92
  
  
    
    def configure(cls, config, extra=[]):

  		




  93
  
  
    
        for directory in extra:

  		




  94
  
  
    
            cls.register_extra_dir(directory)

  		




  95
  
  
    

  		




  
  92
  
    
    def configure(cls, config):

  		




  
  93
  
    
        if config.has_section('extra'):

  		




  
  94
  
    
            for name, directory in config.items('extra'):

  		




  
  95
  
    
                cls.register_extra_dir(directory)

  		




  96
  96
  
    
        if config.has_option("main", "app_dir"):

  		




  97
  97
  
    
            cls.APP_DIR = config.get("main", "app_dir")

  		




  98
  98
  
    
        if config.has_option("main", "data_dir"):

  		












  

    
      wcs/qommon/ctl.py
    
  





  61
  61
  
    
            self.config.set("main", "app_dir", sub_options.app_dir)

  		




  62
  62
  
    
        if sub_options.data_dir:

  		




  63
  63
  
    
            self.config.set("main", "data_dir", sub_options.data_dir)

  		




  
  64
  
    
        if sub_options.extra:

  		




  
  65
  
    
            if not self.config.has_section('extra'):

  		




  
  66
  
    
                self.config.add_section('extra')

  		




  
  67
  
    
            for i, extra in enumerate(sub_options.extra):

  		




  
  68
  
    
                self.config.set("extra", "cmd_line_extra_%d" % i, extra)

  		




  64
  69
  
    
        return self.execute(base_options, sub_options, args)

  		




  65
  70
  
    

  		




  66
  71
  
    
    def parse_args(self, args):

  		




  67
  
  
    
-