Merge lp:~ensoft-opensource/ensoft-sextant/minor_bugfixes into lp:ensoft-sextant

[Patrick Stevens]

Suppress the "Exit request sent." message SSH prints when it closes a tunnel.

Suppress the "Exit request sent." message SSH prints when it closes a tunnel.

[ChrisD (gingerchris)]

review: Approve

=== modified file 'src/sextant/__main__.py'
--- src/sextant/__main__.py	2014-09-01 16:02:04 +0000
+++ src/sextant/__main__.py	2014-09-02 11:05:02 +0000
@@ -3,10 +3,11 @@
 # Copyright 2014, Ensoft Ltd.
 # Author: James Harkin, using work from Patrick Stevens and James Harkin
 # -----------------------------------------
-#invokes Sextant and argparse
+# Invokes Sextant and argparse
 
 from __future__ import absolute_import, print_function
 
+import io
 import sys
 import random
 import socket
@@ -14,6 +15,7 @@
 import logging.config
 import argparse
 import requests
+import contextlib
 import subprocess
 
 try:
@@ -311,16 +313,23 @@
     cmd = ['ssh',
            '-S', 'sextantcontroller{}'.format(local_port),
            '-O', 'exit',
+           '-q',  # for quiet
            remote_host]
 
-    return_code = subprocess.call(cmd)
-    if return_code == 0:
+    # SSH has a bug on some systems which causes it to ignore the -q flag
+    # meaning it prints "Exit request sent." to stderr.
+    # To avoid this, we grab stderr temporarily, and see if it's that string;
+    # if it is, suppress it.
+    pr = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = pr.communicate()
+    if stderr.rstrip() != 'Exit request sent.':
+        print(stderr, file=sys.stderr)
+    if pr.returncode == 0:
         logging.debug('Shut down successfully.')
     else:
         logging.warning(
-            'SSH tunnel shutdown returned error code {}'.format(return_code))
-        logging.warning(
-            'You may need to close sextantcontroller{} manually.'.format(local_port))
+            'SSH tunnel shutdown returned error code {}'.format(pr.returncode))
+        logging.warning(stderr)
 
 
 def _is_port_used(port):