Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop log.DBusHandler

Browse Source 
Packages had missing dependency on python-dbus. Since DBusHandler isn't
used anywhere, drop it, instead of introducing more dependencies.

Reported by @pietrushnic
QubesOS/qubes-issues#3179
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-16 01:29:12 +02:00
parent 2f7d1ca476
commit 654da7cb03
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
qubesadmin/log.py
View File

@ -27,8 +27,6 @@ See also: :py:attr:`qubes.vm.qubesvm.QubesVM.log`
import logging import logging
import sys import sys
import dbus
FORMAT_CONSOLE = '%(name)s: %(message)s' FORMAT_CONSOLE = '%(name)s: %(message)s'
FORMAT_LOG = '%(asctime)s %(message)s' FORMAT_LOG = '%(asctime)s %(message)s'
FORMAT_DEBUG = '%(asctime)s ' \ FORMAT_DEBUG = '%(asctime)s ' \
@ -39,43 +37,6 @@ formatter_log = logging.Formatter(FORMAT_LOG)
formatter_debug = logging.Formatter(FORMAT_DEBUG) formatter_debug = logging.Formatter(FORMAT_DEBUG)
class DBusHandler(logging.Handler):
'''Handler which displays records as DBus notifications'''
#: mapping of loglevels to icons
app_icons = {
logging.ERROR: 'dialog-error',
logging.WARNING: 'dialog-warning',
logging.NOTSET: 'dialog-information',
}
def __init__(self, *args, **kwargs):
super(DBusHandler, self).__init__(*args, **kwargs)
self._notify_object = dbus.SessionBus().get_object(
'org.freedesktop.Notifications', '/org/freedesktop/Notifications')
def emit(self, record):
app_icon = self.app_icons[
max(level for level in self.app_icons if level <= record.levelno)]
try:
# https://developer.gnome.org/notification-spec/#command-notify
self._notify_object.Notify(
'Qubes', # STRING app_name
0, # UINT32 replaces_id
app_icon, # STRING app_icon
record.msg, # STRING summary
'', # STRING body
(), # ARRAY actions
{}, # DICT hints
0, # INT32 timeout
dbus_interface='org.freedesktop.Notifications')
except dbus.DBusException:
pass
def enable(): def enable():
'''Enable global logging '''Enable global logging