gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-23 14:42:29 +01:00
Code Issues Projects Releases Wiki Activity

Make sure debug settings are propogated down the stack as soon a the daemon loads.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-02-03 00:05:11 -05:00
parent e23af9b413
commit b54dbcff92
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wicd/networking.py
View File

@@ -132,7 +132,7 @@ def expand_script_macros(script, msg, bssid, essid):
class Controller(object): class Controller(object):
""" Parent class for the different interface types. """ """ Parent class for the different interface types. """
def __init__(self): def __init__(self, debug=False):
""" Initialise the class. """ """ Initialise the class. """
self.global_dns_1 = None self.global_dns_1 = None
self.global_dns_2 = None self.global_dns_2 = None
@@ -141,7 +141,7 @@ class Controller(object):
self.global_search_dom = None self.global_search_dom = None
self._dhcp_client = None self._dhcp_client = None
self._flush_tool = None self._flush_tool = None
self._debug = None self._debug = debug
self._backend = None self._backend = None
self.connecting_thread = None self.connecting_thread = None
self.before_script = None self.before_script = None
@@ -477,9 +477,9 @@ class ConnectThread(threading.Thread):
class Wireless(Controller): class Wireless(Controller):
""" A wrapper for common wireless interface functions. """ """ A wrapper for common wireless interface functions. """
def __init__(self): def __init__(self, debug=False):
""" Initialize the class. """ """ Initialize the class. """
Controller.__init__(self) Controller.__init__(self, debug=debug)
self._wpa_driver = None self._wpa_driver = None
self._wireless_interface = None self._wireless_interface = None
self.wiface = None self.wiface = None
@@ -844,9 +844,9 @@ class WirelessConnectThread(ConnectThread):
class Wired(Controller): class Wired(Controller):
""" A wrapper for common wired interface functions. """ """ A wrapper for common wired interface functions. """
def __init__(self): def __init__(self, debug=False):
""" Initialise the class. """ """ Initialise the class. """
Controller.__init__(self) Controller.__init__(self, debug=debug)
self.wpa_driver = None self.wpa_driver = None
self._link_detect = None self._link_detect = None
self._wired_interface = None self._wired_interface = None

9
wicd/wicd-daemon.py
View File

@@ -79,10 +79,11 @@ class WicdDaemon(dbus.service.Object):
""" Initializes the daemon DBus object. """ """ Initializes the daemon DBus object. """
dbus.service.Object.__init__(self, bus_name=bus_name, dbus.service.Object.__init__(self, bus_name=bus_name,
object_path=object_path) object_path=object_path)
self.wifi = networking.Wireless()
self.wired = networking.Wired()
self.config = ConfigManager(os.path.join(wpath.etc, self.config = ConfigManager(os.path.join(wpath.etc,
"manager-settings.conf")) "manager-settings.conf"))
self._debug_mode = bool(self.config.get("Settings", "debug_mode"))
self.wifi = networking.Wireless(debug=self._debug_mode)
self.wired = networking.Wired(debug=self._debug_mode)
self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired) self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired)
self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi) self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi)
self.forced_disconnect = False self.forced_disconnect = False
@@ -274,8 +275,8 @@ class WicdDaemon(dbus.service.Object):
""" Sets if debugging mode is on or off. """ """ Sets if debugging mode is on or off. """
self.config.set("Settings", "debug_mode", debug, write=True) self.config.set("Settings", "debug_mode", debug, write=True)
self.debug_mode = misc.to_bool(debug) self.debug_mode = misc.to_bool(debug)
self.wifi.debug = self.debug_mode self.wifi.debug = debug
self.wired.debug = self.debug_mode self.wired.debug = debug
self.wireless_bus.debug_mode = debug self.wireless_bus.debug_mode = debug
self.wired_bus.debug_mode = debug self.wired_bus.debug_mode = debug