Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use config.xml cached at startup in Django settings #83

Merged
merged 1 commit into from
Nov 22, 2019
Merged

Use config.xml cached at startup in Django settings #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions omeroweb/webclient/webclient_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@

from omero.gateway import KNOWN_WRAPPERS

from omero.plugins.admin import AdminControl

from django.utils.encoding import smart_str
from django.conf import settings

Expand Down Expand Up @@ -249,14 +247,11 @@ def getClientSettings(self):
Local config settings override client settings sent by the server
"""
configmap = super(OmeroWebGateway, self).getClientSettings()
localcfg = AdminControl().open_config()
try:
for key in localcfg.keys():
if key.startswith('omero.client.'):
configmap[key] = localcfg[key]
return configmap
finally:
localcfg.close()
localcfg = settings.CONFIG_XML
for key in localcfg.keys():
if key.startswith('omero.client.'):
configmap[key] = localcfg[key]
return configmap

def getEmailSettings(self):
"""
Expand Down