From: Joe Guo Date: Mon, 20 Aug 2018 04:18:45 +0000 (+1200) Subject: script/traffic_replay: get debug level via api X-Git-Tag: tdb-1.3.17~1370 X-Git-Url: http://git.samba.org/samba.git/?p=garming%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=57594c8772aac6341516fb78f452564f83cec54a script/traffic_replay: get debug level via api The -d option will set samba global debug level automatically. We should not parse and use the passed in value. Use samba.get_debug_level instead. Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/script/traffic_replay b/script/traffic_replay index a5074448ded..a1a293b0ea0 100755 --- a/script/traffic_replay +++ b/script/traffic_replay @@ -26,7 +26,7 @@ import random sys.path.insert(0, "bin/python") -from samba import gensec +from samba import gensec, get_debug_level from samba.emulate import traffic import samba.getopt as options @@ -134,6 +134,9 @@ def main(): parser.print_usage() return + debuglevel = get_debug_level() + traffic.DEBUG_LEVEL = debuglevel + if opts.clean_up: print_err("Removing user and machine accounts") lp = sambaopts.get_loadparm() @@ -223,8 +226,6 @@ def main(): print_err(e) sys.exit() - traffic.DEBUG_LEVEL = opts.debuglevel - duration = opts.duration if duration is None: duration = 60.0 @@ -269,7 +270,7 @@ def main(): else: conversations = [] - if opts.debuglevel > 5: + if debuglevel > 5: for c in conversations: for p in c.packets: print(" ", p, file=sys.stderr)