import util.linux as linux_utils
import util.go_utils as gobject_utils
import constants
-from butterfly import ButterflyConnectionManager
+import connection_manager
IDLE_TIMEOUT = 5000
manager.quit()
mainloop.quit()
+ def timeout_cb():
+ if len(manager._connections) == 0:
+ logging.info('No connection received - quitting')
+ quit()
+ return False
- if 'BUTTERFLY_PERSIST' not in os.environ:
- def timeout_cb():
- if len(manager._connections) == 0:
- logging.info('No connection received - quitting')
- quit()
- return False
+ if 'THEONERING_PERSIST' not in os.environ:
gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
shutdown_callback = quit
else:
signal.signal(signal.SIGTERM, quit)
try:
- manager = ButterflyConnectionManager(shutdown_func=shutdown_callback)
+ manager = connection_manager.TheOneRingConnectionManager(shutdown_func=shutdown_callback)
except dbus.exceptions.NameExistsException:
logging.warning('Failed to acquire bus name, connection manager already running?')
sys.exit(1)
if __name__ == '__main__':
- telepathy_utils.debug_divert_messages(os.getenv('BUTTERFLY_LOGFILE'))
+ telepathy_utils.debug_divert_messages(os.getenv('THEONERING_LOGFILE'))
logging.basicConfig(level=logging.DEBUG)
run_theonering()