sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid breaking activity startup by dbus timeout on sigle instance - Fixes #4773

Browse Source 
This problem only happen in activities configured with the option -s
in the activity.info "exec" field, and the objective is use a single process,
even when starting more than one instance. If the process do not reply,
start a new process, instead of show a error.

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
This commit is contained in:
Gonzalo Odiard 2014-05-19 17:38:03 -03:00 committed by Martin Abente Lahaye
parent 43a4611d75
commit f157b1148e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/sugar-activity
View File

@ -145,12 +145,18 @@ def main():
if not name: if not name:
SingleProcess(service_name, activity_constructor) SingleProcess(service_name, activity_constructor)
else: else:
single_process = sessionbus.get_object(service_name, service_path) try:
single_process.create(activity_handle.get_dict(), single_process = sessionbus.get_object(service_name,
dbus_interface='org.laptop.SingleProcess') service_path)
single_process.create(
activity_handle.get_dict(),
dbus_interface='org.laptop.SingleProcess')
print 'Created %s in a single process.' % service_name print 'Created %s in a single process.' % service_name
sys.exit(0) sys.exit(0)
except (TypeError, dbus.DBusException):
print 'Could not communicate with the instance process,' \
'launching a new process'
if hasattr(module, 'start'): if hasattr(module, 'start'):
module.start() module.start()