itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #88 from mattrose/dbus-error 

Do not crash when dbus server is unavailable, just emit an error message
This commit is contained in:
Matt Rose 2020-06-02 11:02:18 -04:00 committed by GitHub
parent 9d5c2a6bb3 2f7b4f39ff
commit 3f20a8ac27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
terminatorlib/ipc.py
View File

@ -11,7 +11,7 @@ from .borg import Borg
from .terminator import Terminator from .terminator import Terminator
from .config import Config from .config import Config
from .factory import Factory from .factory import Factory
from .util import dbg, enumerate_descendants from .util import dbg, err, enumerate_descendants
CONFIG = Config() CONFIG = Config()
if not CONFIG['dbus']: if not CONFIG['dbus']:
@ -46,7 +46,11 @@ class DBusService(Borg, dbus.service.Object):
"""Ensure we are populated""" """Ensure we are populated"""
if not self.bus_name: if not self.bus_name:
dbg('Checking for bus name availability: %s' % BUS_NAME) dbg('Checking for bus name availability: %s' % BUS_NAME)
bus = dbus.SessionBus() try:
bus = dbus.SessionBus()
except Exception as e:
err('Unable to connect to DBUS Server, proceeding as standalone')
raise ImportError
proxy = bus.get_object('org.freedesktop.DBus', proxy = bus.get_object('org.freedesktop.DBus',
'/org/freedesktop/DBus') '/org/freedesktop/DBus')
flags = 1 | 4 # allow replacement | do not queue flags = 1 | 4 # allow replacement | do not queue