Kick message to control queue to reload sanitize whitelist in multiprocess mode.

This commit is contained in:
Dannon Baker
2015-07-27 14:39:07 -04:00
parent 5280393708
commit abe5571d43
2 changed files with 8 additions and 1 deletions
+7 -1
View File
@@ -62,6 +62,11 @@ def reload_display_application(app, **kwargs):
app.datatypes_registry.reload_display_applications( display_application_ids)
def reload_sanitize_whitelist(app):
log.debug("Executing reload sanitize whitelist control task.")
app.config.reload_sanitize_whitelist()
def reload_tool_data_tables(app, **kwargs):
params = util.Params(kwargs)
log.debug("Executing tool data table reload for %s" % params.get('table_names', 'all tables'))
@@ -80,7 +85,8 @@ def admin_job_lock(app, **kwargs):
control_message_to_task = { 'reload_tool': reload_tool,
'reload_display_application': reload_display_application,
'reload_tool_data_tables': reload_tool_data_tables,
'admin_job_lock': admin_job_lock}
'admin_job_lock': admin_job_lock,
'reload_sanitize_whitelist': reload_sanitize_whitelist}
class GalaxyQueueWorker(ConsumerMixin, threading.Thread):
+1
View File
@@ -1134,6 +1134,7 @@ class Admin( object ):
new_whitelist = sorted([tid for tid in tools_to_whitelist if tid in trans.app.toolbox.tools_by_id])
f.write("\n".join(new_whitelist))
trans.app.config.sanitize_whitelist = new_whitelist
galaxy.queue_worker.send_control_task(trans.app, 'reload_sanitize_whitelist', noop_self=True)
# dispatch a message to reload list for other processes
return trans.fill_template( '/webapps/galaxy/admin/sanitize_whitelist.mako',
sanitize_all=trans.app.config.sanitize_all_html,