Merge lp:~hopem/maas-deployer/lp1493765 into lp:~maas-deployers/maas-deployer/next

[Edward Hope-Morley]

[lp:~hopem/maas-deployer/lp1493765]

33. By Edward Hope-Morley on 2015-09-10

logging cleanup

[Billy Olsen (billy-olsen)]

LGTM, Thanks!

review: Approve

=== modified file 'maas_deployer/vmaas/maasclient/clidriver.py'
--- maas_deployer/vmaas/maasclient/clidriver.py	2015-09-01 23:15:07 +0000
+++ maas_deployer/vmaas/maasclient/clidriver.py	2015-09-10 16:05:07 +0000
@@ -35,6 +35,14 @@
     def _get_base_command(self):
         return ['maas', 'maas']
 
+    @property
+    def cmd_stdin(self):
+        """String to be provided as stdin when executing commands.
+
+        If nothing required, always return None.
+        """
+        return None
+
     def _maas_execute(self, cmd, *args, **kwargs):
         """
         Executes the specified subcommand. The keyword maas and the profile
@@ -54,7 +62,8 @@
                             cmdarr.append("%s='%s'" % (key, str(v)))
                     else:
                         cmdarr.append("%s='%s'" % (key, str(value)))
-            stdout = execc(cmdarr)[0]
+
+            stdout = execc(cmdarr, stdin=self.cmd_stdin)[0]
 
             display_stdout = stdout
             if display_stdout and len(display_stdout) > 100:
@@ -320,6 +329,14 @@
         super(SSHDriver, self).__init__(api_url, api_key)
         self._login(api_url, api_key)
 
+    @property
+    def cmd_stdin(self):
+        """Space-separated list of environment variables.
+
+        If no env vars required, always return None.
+        """
+        return 'LC_ALL=C'
+
     def _login(self, api_url, api_key):
         cmd = ['ssh', '-i', os.path.expanduser('~/.ssh/id_maas'),
                '-o', 'UserKnownHostsFile=/dev/null',
@@ -327,7 +344,7 @@
                '-o', 'LogLevel=quiet',
                '{}@{}'.format(self.ssh_user, self.maas_ip),
                'maas', 'login', 'maas', api_url, api_key]
-        execc(cmd)
+        execc(cmd, stdin=self.cmd_stdin)
 
     def _get_base_command(self):
         cmd = ['ssh', '-i', os.path.expanduser('~/.ssh/id_maas'),
 
=== modified file 'maas_deployer/vmaas/util.py'
--- maas_deployer/vmaas/util.py	2015-08-14 09:16:18 +0000
+++ maas_deployer/vmaas/util.py	2015-09-10 16:05:07 +0000
@@ -53,7 +53,7 @@
     _input = None
 
     # Abridge stdin for log if provided
-    _stdin = None
+    _stdin = ''
     if stdin:
         _stdin = stdin
         if type(stdin) == file:
@@ -62,7 +62,7 @@
             if len(_stdin) > 10:
                 _stdin = "'%s...'" % _stdin[:10]
 
-    log.debug("Executing: '%s' stdin=%s", ' '.join(cmd), _stdin)
+    log.debug("Executing: '%s' stdin='%s'", ' '.join(cmd), _stdin)
 
     if stdin:
         if type(stdin) == file: