dev_5_0: Update upgrade check handling in OMERO.web#2176
dev_5_0: Update upgrade check handling in OMERO.web#2176joshmoore merged 3 commits intoome:dev_5_0from
Conversation
Python socket timeouts are specified in seconds as floating point. This commit sets the default timeout to a more reasonable 3 seconds, allows the specification of a floating point timeout value, removes the assumption that the timeout is specified in milliseconds and documents all of the aforementioned.
This commit adds configurability to the upgrade check URL via the
OMERO.web configuration mechanism. Upgrade checks in OMERO.web can now
be disabled by running:
bin/omero config set omero.web.upgrades_url ''
|
The timeouts for For the webclient, I'm not seeing the timeout disabled - upgrade check still takes a couple of seconds after setting the url to ''. |
|
Do you have |
|
Yes I do have OMERO_HOME set, but this seemed to work OK now... |
|
@will-moore: Great. That's all a kind of round about way to test this all without explicitly putting debugging into OMERO.web and having a full server setup. |
|
See merge comment under gh-2175. Merging for release of 5.0.1 |
dev_5_0: Update upgrade check handling in OMERO.web
This pull requests updates the base socket timeout semantics of the OMERO.py upgrade check and allows for upgrade check configurability in OMERO.web. OMERO tickets addressed include:
#12097(https://trac.openmicroscopy.org.uk/ome/ticket/12097)To test timeouts, you will need a merge build with the changes included. Running under
bin/omero shell:134.36.64.142is a University of Dundee firewalled IP address that can be used for internal or external testing. Default timeouts should be in the neighbourhood of 3 seconds. Example output:If needed the timeout can be adjusted and checked (example is a timeout of 10 seconds) by using:
OMERO.web upgrade check configurability can also be tested with a merge build. Running under
DJANGO_SETTINGS_MODULE=settings PYTHONPATH=$PYTHONPATH:lib/python/omeroweb bin/omero shell:Disabled upgrade checks should return instantly. Example output:
The source branch for this pull request has been based atop the
v.4.4.0tag so that it can be merged cleanly into:dev_4_4(dev_4_4: Update upgrade check handling in OMERO.web #2175)dev_5_0(dev_5_0: Update upgrade check handling in OMERO.web #2176)develop(develop: Update upgrade check handling in OMERO.web #2177)--rebased-to #2175
--rebased-to #2177