diff options
| author | Jeff Lane <jeffrey.lane@canonical.com> | 2015-05-01 15:08:09 +0200 |
|---|---|---|
| committer | Jeff Lane <jeffrey.lane@canonical.com> | 2015-05-01 15:08:09 +0200 |
| commit | dd020669d4dcc6a1f036a4b9bbf8788770a60cdb (patch) | |
| tree | e0a2f419c4aba52187b99e83eb1f2d331e9e1a32 | |
| parent | d7d96c817e0b38db6f6185f3fd892bb734bd0785 (diff) | |
Added back in a print I removed before but moved it to debug output. Added in option of debug output wiht a default of info level output
| -rwxr-xr-x | bin/network | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/bin/network b/bin/network index b410867f..c98a5be7 100755 --- a/bin/network +++ b/bin/network @@ -43,7 +43,6 @@ from subprocess import ( import sys import time -logging.basicConfig(level=logging.INFO) class IPerfPerformanceTest(object): @@ -111,6 +110,7 @@ class IPerfPerformanceTest(object): iperf_return = iperf_exception.output # 930 Mbits/sec\n' + logging.debug(iperf_return) speeds = list(map(float, re.findall(r"([\w\.]+)\sMbits/sec", iperf_return))) invalid_speed = False @@ -712,6 +712,9 @@ TEST_TARGET_IPERF = iperf-server.example.com help=("IPERF Test ONLY. Set the failure threshold (Percent of maximum " "theoretical bandwidth) as a number like 80. (Default is " "%(default)s)")) + test_parser.add_argument( + '--debug', default=False, action="store_true", + help="Turn on verbose output") # Sub info options info_parser.add_argument( @@ -735,11 +738,20 @@ TEST_TARGET_IPERF = iperf-server.example.com info_parser.add_argument( '--status', default=False, action="store_true", help=("displays connection status")) + info_parser.add_argument( + '--debug', default=False, action="store_true", + help="Turn on verbose output") test_parser.set_defaults(func=interface_test) info_parser.set_defaults(func=interface_info) args = parser.parse_args() + + if args.debug: + logging.basicConfig(level=logging.DEBUG) + else: + logging.basicConfig(level=logging.INFO) + if 'func' not in args: parser.print_help() else: |
