From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 19 Sep 2017 13:54:35 +0000 (+0000)
Subject: tools: frr-reload capture stderr so we can log it
X-Git-Tag: frr-4.0-dev~267^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=478f9ce277d1b65794e3883bedc2f2206cafcd7c;p=matthieu%2Ffrr.git

tools: frr-reload capture stderr so we can log it

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 53188ec31b..afe66b6eaf 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -1152,7 +1152,7 @@ if __name__ == '__main__':
 
                     while True:
                         try:
-                            _ = subprocess.check_output(cmd)
+                            _ = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
 
                         except subprocess.CalledProcessError:
 
@@ -1197,7 +1197,7 @@ if __name__ == '__main__':
                             fh.write(line + '\n')
 
                     try:
-                        subprocess.check_output(['/usr/bin/vtysh', '-f', filename])
+                        subprocess.check_output(['/usr/bin/vtysh', '-f', filename], stderr=subprocess.STDOUT)
                     except subprocess.CalledProcessError as e:
                         log.warning("frr-reload.py failed due to\n%s" % e.output)
                         reload_ok = False