script/traffic_replay: get debug level via api
authorJoe Guo <joeg@catalyst.net.nz>
Mon, 20 Aug 2018 04:18:45 +0000 (16:18 +1200)
committerDouglas Bagnall <dbagnall@samba.org>
Wed, 10 Oct 2018 04:16:21 +0000 (06:16 +0200)
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 <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
script/traffic_replay

index a5074448dedf8d02003296c5c69260f78f5daf4e..a1a293b0ea0b84cbb26ed6e8cbec2b121c7d1454 100755 (executable)
@@ -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)