diff --git a/test/debug-helper.py b/test/debug-helper.py index 38e7072f73..ebf08475aa 100755 --- a/test/debug-helper.py +++ b/test/debug-helper.py @@ -6,15 +6,6 @@ import argparse bus = dbus.SystemBus() -nm_bus = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') -mm_bus = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager') -wpa_bus = bus.get_object('fi.w1.wpa_supplicant1', '/fi/w1/wpa_supplicant1') - -nm = dbus.Interface(nm_bus, dbus_interface='org.freedesktop.NetworkManager') -mm = dbus.Interface(mm_bus, dbus_interface='org.freedesktop.ModemManager') -wpa = dbus.Interface(wpa_bus, dbus_interface='fi.w1.wpa_supplicant1') -wpa_properties = dbus.Interface(wpa_bus, dbus_interface='org.freedesktop.DBus.Properties') - parser = argparse.ArgumentParser(description='Interface to easily control logging levels for NetworkManager, ModemManager, and wpasupplicant.') # NM options @@ -40,10 +31,16 @@ if args.do_set_nm_logging: if args.log_domains: dom_msg = " for domains: " + ','.join(args.log_domains) print "Setting NetworkManager log level to '" + args.do_set_nm_logging + "'" + dom_msg + + nm_bus = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') + nm = dbus.Interface(nm_bus, dbus_interface='org.freedesktop.NetworkManager') nm.SetLogging(args.do_set_nm_logging, ','.join(args.log_domains)) if args.do_set_mm_logging: print "Setting ModemManager log level to '" + args.do_set_mm_logging + "'" + + mm_bus = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager') + mm = dbus.Interface(mm_bus, dbus_interface='org.freedesktop.ModemManager') mm.SetLogging(args.do_set_mm_logging) if args.do_set_wpa_logging: @@ -56,6 +53,8 @@ if args.do_set_wpa_logging: print "Disabling timestamps for wpasupplicant debugging logs" use_timestamps = dbus.Boolean(False, variant_level=1) + wpa_bus = bus.get_object('fi.w1.wpa_supplicant1', '/fi/w1/wpa_supplicant1') + wpa_properties = dbus.Interface(wpa_bus, dbus_interface='org.freedesktop.DBus.Properties') wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugTimestamp', use_timestamps) wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugLevel', dbus.String(args.do_set_wpa_logging, variant_level=1))