'slapos proxy start' command

setup.py

@@ -86,6 +86,7 @@ setup(name=name,
           'node software = slapos.cli.slapgrid:SoftwareCommand',
           'node instance = slapos.cli.slapgrid:InstanceCommand',
           'console = slapos.cli.console:ConsoleCommand',
+          'proxy start = slapos.cli.proxy:ProxyCommand',
           'supply = slapos.cli.supply:SupplyCommand',
           'remove = slapos.cli.remove:RemoveCommand',
           'request = slapos.cli.request:RequestCommand',

slapos/cli/proxy.py

+# -*- coding: utf-8 -*-
+
+import logging
+
+from slapos.cli.config import ConfigCommand
+from slapos.proxy import do_proxy, ProxyConfig
+
+
+class ProxyCommand(ConfigCommand):
+    """
+    minimalist, stand-alone SlapOS Master
+    """
+
+    log = logging.getLogger('proxy')
+
+    def get_parser(self, prog_name):
+        ap = super(ProxyCommand, self).get_parser(prog_name)
+
+        ap.add_argument('-u', '--database-uri',
+                        help='URI for sqlite database')
+
+        return ap
+
+    def take_action(self, args):
+        configp = self.fetch_config(args)
+
+        conf = ProxyConfig(logger=self.log)
+
+        conf.mergeConfig(args, configp)
+
+        if not self.app.options.log_file and hasattr(conf, 'log_file'):
+            # no log file is provided by argparser,
+            # we set up the one from config
+            file_handler = logging.FileHandler(conf.log_file)
+            formatter = logging.Formatter(self.app.LOG_FILE_MESSAGE_FORMAT)
+            file_handler.setFormatter(formatter)
+            self.log.addHandler(file_handler)
+
+        conf.setConfig()
+
+        do_proxy(conf=conf)
+

slapos/cli_legacy/proxy.py

@@ -41,10 +41,10 @@ def main():
 
   if args.verbose:
     logger.setLevel(logging.DEBUG)
-  else: 
+  else:
     logger.setLevel(logging.INFO)
 
-  conf = ProxyConfig(logger)
+  conf = ProxyConfig(logger=logger)
 
   configp = ConfigParser.SafeConfigParser()
   if configp.read(args.configuration_file) != [args.configuration_file]: