RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor logging tweaks

This commit is contained in:
Daniel Pavel 2013-07-01 15:00:21 +02:00
parent eaa38c858c
commit b1e9480f5a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/solaar/listener.py
View File

@ -117,16 +117,15 @@ class ReceiverListener(_listener.EventsListener):
def _status_changed(self, device, alert=_status.ALERT.NONE, reason=None): def _status_changed(self, device, alert=_status.ALERT.NONE, reason=None):
assert device is not None assert device is not None
if _log.isEnabledFor(_DEBUG): if device.kind is None:
if device.kind is None: _log.info("status_changed %s: %s, %s (%X) %s", device,
_log.debug("status_changed %s: %s, %s (%X) %s", device, 'present' if bool(device) else 'removed',
'present' if bool(device) else 'removed', device.status, alert, reason or '')
device.status, alert, reason or '') else:
else: _log.info("status_changed %s: %s %s, %s (%X) %s", device,
_log.debug("status_changed %s: %s %s, %s (%X) %s", device, 'paired' if bool(device) else 'unpaired',
'paired' if bool(device) else 'unpaired', 'online' if device.online else 'offline',
'online' if device.online else 'offline', device.status, alert, reason or '')
device.status, alert, reason or '')
if device.kind is None: if device.kind is None:
assert device == self.receiver assert device == self.receiver

7
lib/solaar/ui/__init__.py
View File

@ -14,6 +14,8 @@ GLib.threads_init()
def _error_dialog(reason, object): def _error_dialog(reason, object):
_log.error("%s: %s", reason, object)
if reason == 'permissions': if reason == 'permissions':
title = 'Permissions error' title = 'Permissions error'
text = ('Found a Logitech Receiver (%s), but did not have permission to open it.\n' text = ('Found a Logitech Receiver (%s), but did not have permission to open it.\n'
@ -26,7 +28,7 @@ def _error_dialog(reason, object):
else: else:
raise Exception("ui.error_dialog: don't know how to handle (%s, %s)", reason, object) raise Exception("ui.error_dialog: don't know how to handle (%s, %s)", reason, object)
assert text assert title
assert text assert text
m = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, text) m = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, text)
@ -63,7 +65,8 @@ def destroy():
from logitech.unifying_receiver.status import ALERT from logitech.unifying_receiver.status import ALERT
def _status_changed(device, alert, reason): def _status_changed(device, alert, reason):
assert device is not None assert device is not None
_log.info("status changed: %s (%s) %s", device, alert, reason) if _log.isEnabledFor(_DEBUG):
_log.debug("status changed: %s (%s) %s", device, alert, reason)
tray.update(device) tray.update(device)
if alert & ALERT.ATTENTION: if alert & ALERT.ATTENTION: