moved old entry point for slapproxy

setup.py

@@ -57,7 +57,7 @@ setup(name=name,
         'console_scripts': [
           # One entry point to control them all
           'slapos-watchdog = slapos.grid.watchdog:main',
-          'slapproxy = slapos.proxy:main',
+          'slapproxy = slapos.cli_legacy.proxy:main',
           'slapproxy-query = slapos.proxy.query:main',
           'slapos = slapos.cli.entry:main',
           # Deprecated entry points

slapos/cli_legacy/proxy.py

+# -*- coding: utf-8 -*-
+# vim: set et sts=2:
+
+import argparse
+import ConfigParser
+import logging
+import os
+import sys
+
+from slapos.proxy import ProxyConfig, do_proxy
+
+class UsageError(Exception):
+  pass
+
+
+def main():
+  ap = argparse.ArgumentParser()
+
+  ap.add_argument('-l', '--log_file',
+                  help='The path to the log file used by the script.')
+
+  ap.add_argument('-v', '--verbose',
+                  action='store_true',
+                  help='Verbose output.')
+
+  # XXX not used anymore, deprecated
+  ap.add_argument('-c', '--console',
+                  action='store_true',
+                  help='Console output.')
+
+  ap.add_argument('-u', '--database-uri',
+                  help='URI for sqlite database')
+
+  ap.add_argument('configuration_file',
+                  help='path to slapos.cfg')
+
+  args = ap.parse_args()
+
+  logger = logging.getLogger('slapproxy')
+  logger.addHandler(logging.StreamHandler())
+
+  if args.verbose:
+    logger.setLevel(logging.DEBUG)
+  else: 
+    logger.setLevel(logging.INFO)
+
+  conf = ProxyConfig(logger)
+
+  configp = ConfigParser.SafeConfigParser()
+  if configp.read(args.configuration_file) != [args.configuration_file]:
+    raise UsageError('Cannot find or parse configuration file: %s' % args.configuration_file)
+
+  conf.mergeConfig(args, configp)
+
+  if conf.log_file:
+    if not os.path.isdir(os.path.dirname(conf.log_file)):
+      raise ValueError('Please create directory %r to store %r log file' % (
+        os.path.dirname(conf.log_file), conf.log_file))
+    file_handler = logging.FileHandler(conf.log_file)
+    file_handler.setFormatter(logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s"))
+    logger.addHandler(file_handler)
+    logger.info('Configured logging to file %r' % conf.log_file)
+
+  conf.setConfig()
+
+  try:
+    do_proxy(conf=conf)
+    return_code = 0
+  except SystemExit as err:
+    return_code = err
+
+  sys.exit(return_code)

slapos/proxy/__init__.py

 # -*- coding: utf-8 -*-
+# vim: set et sts=2:
 ##############################################################################
 #
 # Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
@@ -27,91 +28,33 @@
 #
 ##############################################################################
 
-import os
-import sys
-import argparse
-import logging
-import logging.handlers
-import ConfigParser
-
 
 class ProxyConfig(object):
-  def setConfig(self, option_dict, configuration_file_path):
-    """
-    Set options given by parameters.
-    """
+  def __init__(self, logger):
+    self.logger = logger
+
+  def mergeConfig(self, args, configp):
     # Set options parameters
-    for option, value in option_dict.__dict__.items():
+    for option, value in args.__dict__.items():
       setattr(self, option, value)
 
-    # Load configuration file
-    configuration_parser = ConfigParser.SafeConfigParser()
-    configuration_parser.read(configuration_file_path)
     # Merges the arguments and configuration
     for section in ("slapproxy", "slapos"):
-      configuration_dict = dict(configuration_parser.items(section))
+      configuration_dict = dict(configp.items(section))
       for key in configuration_dict:
         if not getattr(self, key, None):
           setattr(self, key, configuration_dict[key])
 
-    # set up logging
-    self.logger = logging.getLogger("slapproxy")
-    self.logger.setLevel(logging.INFO)
-    self.logger.addHandler(logging.StreamHandler())
 
+  def setConfig(self):
     if not self.database_uri:
       raise ValueError('database-uri is required.')
-    if self.log_file:
-      if not os.path.isdir(os.path.dirname(self.log_file)):
-        raise ValueError('Please create directory %r to store %r log file' % (
-          os.path.dirname(self.log_file), self.log_file))
-      else:
-        file_handler = logging.FileHandler(self.log_file)
-        file_handler.setFormatter(logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s"))
-        self.logger.addHandler(file_handler)
-        self.logger.info('Configured logging to file %r' % self.log_file)
-
-    if self.verbose:
-      self.logger.setLevel(logging.DEBUG)
-
-
-
-def run(config):
-  from views import app
-  app.config['computer_id'] = config.computer_id
-  app.config['DATABASE_URI'] = config.database_uri
-  app.run(host=config.host, port=int(config.port))
-
-
-def main():
-  ap = argparse.ArgumentParser()
-
-  ap.add_argument('-l', '--log_file',
-                  help='The path to the log file used by the script.')
-
-  ap.add_argument('-v', '--verbose',
-                  action='store_true',
-                  help='Verbose output.')
-
-  # XXX not used anymore, deprecated
-  ap.add_argument('-c', '--console',
-                  action='store_true',
-                  help='Console output.')
-
-  ap.add_argument('-u', '--database-uri',
-                  help='URI for sqlite database')
 
-  ap.add_argument('configuration_file',
-                  help='path to slapos.cfg')
 
-  args = ap.parse_args()
+def do_proxy(conf):
+  from slapos.proxy.views import app
+  app.config['computer_id'] = conf.computer_id
+  app.config['DATABASE_URI'] = conf.database_uri
+  app.run(host=conf.host, port=int(conf.port))
 
-  try:
-    conf = ProxyConfig()
-    conf.setConfig(args, args.configuration_file)
-    run(conf)
-    return_code = 0
-  except SystemExit as err:
-    return_code = err
 
-  sys.exit(return_code)