nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-13 10:30:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Fix async config and message regressions

Browse Source
This commit is contained in:
James Valleroy 2016-09-12 20:56:51 -04:00 committed by Sunil Mohan Adapa
parent 31f95cfb12
commit f52f3f70d2
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plinth/modules/tor/views.py
View File

@ -74,6 +74,7 @@ def __apply_changes(request, old_status, new_status):
# Already running a configuration task # Already running a configuration task
return return
setting_changed = False
needs_restart = False needs_restart = False
if old_status['upstream_bridges'] != new_status['upstream_bridges']: if old_status['upstream_bridges'] != new_status['upstream_bridges']:
@ -81,6 +82,7 @@ def __apply_changes(request, old_status, new_status):
actions.superuser_run( actions.superuser_run(
'tor', ['set-upstream-bridges', '--bridges', 'tor', ['set-upstream-bridges', '--bridges',
new_status['upstream_bridges']]) new_status['upstream_bridges']])
setting_changed = True
needs_restart = True needs_restart = True
arguments = [] arguments = []
@ -121,14 +123,20 @@ def __apply_changes(request, old_status, new_status):
if old_status['enabled'] != new_status['enabled']: if old_status['enabled'] != new_status['enabled']:
arg_value = 'enable' if new_status['enabled'] else 'disable' arg_value = 'enable' if new_status['enabled'] else 'disable'
arguments.extend(['--service', arg_value]) arguments.extend(['--service', arg_value])
needs_restart = False config_process = actions.superuser_run(
'tor', ['configure'] + arguments, async=True)
return
if arguments: if arguments:
actions.superuser_run('tor', ['configure'] + arguments) actions.superuser_run('tor', ['configure'] + arguments)
setting_changed = True
if not needs_restart:
messages.success(request, _('Configuration updated.'))
if needs_restart and new_status['enabled']: if needs_restart and new_status['enabled']:
config_process = actions.superuser_run('tor', ['restart'], async=True) config_process = actions.superuser_run('tor', ['restart'], async=True)
else:
if not setting_changed:
messages.info(request, _('Setting unchanged')) messages.info(request, _('Setting unchanged'))