projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Random bug fixes, advancing the channels, unit tests, seperating contacts not just...
[theonering]
/
src
/
telepathy-theonering
diff --git
a/src/telepathy-theonering
b/src/telepathy-theonering
index
a32d3db
..
a98f62e
100755
(executable)
--- a/
src/telepathy-theonering
+++ b/
src/telepathy-theonering
@@
-37,25
+37,31
@@
import connection_manager
IDLE_TIMEOUT = 5000
IDLE_TIMEOUT = 5000
-def run_theonering():
+def run_theonering(persist):
linux_utils.set_process_name(constants.__app_name__)
linux_utils.set_process_name(constants.__app_name__)
+ try:
+ os.makedirs(constants._data_path_)
+ except OSError, e:
+ if e.errno != 17:
+ raise
+
@gobject_utils.async
def quit():
manager.quit()
mainloop.quit()
@gobject_utils.async
def quit():
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 persist:
+ shutdown_callback = None
+ else:
gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
shutdown_callback = quit
gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
shutdown_callback = quit
- else:
- shutdown_callback = None
signal.signal(signal.SIGTERM, quit)
signal.signal(signal.SIGTERM, quit)
@@
-75,6
+81,9
@@
def run_theonering():
if __name__ == '__main__':
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)
logging.basicConfig(level=logging.DEBUG)
- run_theonering()
+
+ persist = 'THEONERING_PERSIST' in os.environ
+ persist = True
+ run_theonering(persist)