]> git.puffer.fish Git - mirror/frr.git/commitdiff
tools: frr-reload capture stderr so we can log it
authorDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 19 Sep 2017 13:54:35 +0000 (13:54 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 19 Sep 2017 13:54:35 +0000 (13:54 +0000)
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
tools/frr-reload.py

index 53188ec31b5bb0bd5ef4602b19cf2f212c7025a3..afe66b6eafea5e818d937abc172eb767f1fda4ad 100755 (executable)
@@ -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