node format: set up log handler from config

slapos/cli/format.py

@@ -14,7 +14,7 @@ class FormatCommand(ConfigCommand):
     create users, partitions and network configuration
     """
 
-    log = logging.getLogger('slapformat')
+    log = logging.getLogger('format')
 
     def get_parser(self, prog_name):
         ap = super(FormatCommand, self).get_parser(prog_name)
@@ -65,8 +65,18 @@ class FormatCommand(ConfigCommand):
 
         conf = FormatConfig(logger=self.log)
 
+        conf.mergeConfig(args, configp)
+
+        if not args.log_file and 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)
+
         try:
-            conf.setConfig(args, configp)
+            conf.setConfig()
         except UsageError as err:
             sys.stderr.write(err.message + '\n')
             sys.stderr.write("For help use --help\n")

slapos/cli_legacy/format.py

@@ -31,6 +31,7 @@ import argparse
 import ConfigParser
 import logging
 import sys
+import os
 
 from slapos.format import FormatConfig, UsageError, tracing_monkeypatch, do_format
 
@@ -113,8 +114,23 @@ def main(*args):
   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)):
+      # fallback to console only if directory for logs does not exists and
+      # continue to run
+      raise ValueError('Please create directory %r to store %r log file' % (
+        os.path.dirname(conf.log_file), conf.log_file))
+    else:
+      file_handler = logging.FileHandler(conf.log_file)
+      file_handler.setFormatter(logging.Formatter("%(asctime)s - "
+        "%(name)s - %(levelname)s - %(message)s"))
+      conf.logger.addHandler(file_handler)
+      conf.logger.info('Configured logging to file %r' % conf.log_file)
+
   try:
-    conf.setConfig(args, configp)
+    conf.setConfig()
   except UsageError as exc:
     sys.stderr.write(exc.message + '\n')
     sys.stderr.write("For help use --help\n")

slapos/format.py

@@ -1119,9 +1119,10 @@ class FormatConfig(object):
       raise UsageError('Some required binaries are missing or not '
           'functional: %s' % (','.join(missing_binary_list), ))
 
-  def setConfig(self, args, configp):
+  def mergeConfig(self, args, configp):
     """
     Set options given by parameters.
+    Must be executed before setting up the logger.
     """
     self.key_file = None
     self.cert_file = None
@@ -1137,6 +1138,7 @@ class FormatConfig(object):
         if not getattr(self, key, None):
           setattr(self, key, configuration_dict[key])
 
+  def setConfig(self):
     # setup some nones
     for parameter in ['interface_name', 'partition_base_name', 'user_base_name',
         'tap_base_name', 'ipv4_local_network', 'ipv6_interface']:
@@ -1205,19 +1207,6 @@ class FormatConfig(object):
       sys.stderr.write(message + '\n')
       sys.exit()
 
-    if self.log_file:
-      if not os.path.isdir(os.path.dirname(self.log_file)):
-        # fallback to console only if directory for logs does not exists and
-        # continue to run
-        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)
-
     # Check mandatory options
     for parameter in ('computer_id', 'instance_root', 'master_url',
                       'software_root', 'computer_xml'):