From 2f7b4f39ff875af18a1e4cb4846dd870ac9e78f0 Mon Sep 17 00:00:00 2001 From: Matt Rose Date: Sat, 16 May 2020 16:10:19 -0400 Subject: [PATCH] Do not crash when dbus server is unavailable, just emit an error message --- terminatorlib/ipc.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/terminatorlib/ipc.py b/terminatorlib/ipc.py index b824ae27..861b792c 100644 --- a/terminatorlib/ipc.py +++ b/terminatorlib/ipc.py @@ -11,7 +11,7 @@ from .borg import Borg from .terminator import Terminator from .config import Config from .factory import Factory -from .util import dbg, enumerate_descendants +from .util import dbg, err, enumerate_descendants CONFIG = Config() if not CONFIG['dbus']: @@ -46,7 +46,11 @@ class DBusService(Borg, dbus.service.Object): """Ensure we are populated""" if not self.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', '/org/freedesktop/DBus') flags = 1 | 4 # allow replacement | do not queue