Merge ToolConfWatchers and separate from Toolbox #3821
Conversation
mvdbeek
added
area/tools
kind/refactoring
lib/galaxy/tools/toolbox/watcher.py
Outdated
| t = threading.Thread(target=self.event_handler.on_any_event) | ||
| t.daemon = True | ||
| t.start() | ||
| self.reload_callback() |
There was a problem hiding this comment.
You can reduce the indentation here.
There was a problem hiding this comment.
I'm surprised that wasn't flagged by tox!
There was a problem hiding this comment.
Looks like I'm more 🦅 than flake8 😆
|
Looks much cleaner, thanks @mvdbeek! |
This should avoid some complexities associated with managing threads. I would also like to eliminate the separate reload_tool_data_tables and reload_data_managers callbacks and do this when reloading the toolbox, but every tool data table reload triggers twice the download of http://igv.broadinstitute.org/genomes/genomes.txt, which each time takes 2 seconds.
mvdbeek
force-pushed
the
repository_updates
branch
from
c2e0615
to
c857388
Compare
lib/galaxy/tools/toolbox/watcher.py
Outdated
| from galaxy.queue_worker import ( | ||
| reload_data_managers, | ||
| reload_toolbox, | ||
| ) |
There was a problem hiding this comment.
Nothing in galaxy.tools.toolbox should depend on galaxy.queue_worker IMO. The former module is meant to stand-alone from the app and models - hence the subclassing of ToolBox from AbstractToolBox and the inclusion on that module in galaxy-lib. Can you refactor this config watcher stuff into say galaxy.tools.watchers or galaxy.webapps.galaxy.config_watchers perhaps.
There was a problem hiding this comment.
OK, I think I've done that in 1a5e337.
mvdbeek
changed the title
|
This is ready for review now. |
|
|
||
|
|
||
| class ConfigWatchers(object): | ||
| """Contains ToolConfWatcher, ToolWatcher and ToolDataWatcher objects.""" |
There was a problem hiding this comment.
It seems this class does not contain a ToolWatcher.
There was a problem hiding this comment.
Right, I've made that change in f79fb90
mvdbeek
force-pushed
the
repository_updates
branch
from
061d214
to
2515d01
Compare
mvdbeek
force-pushed
the
repository_updates
branch
from
90bd7ed
to
63f1efd
Compare
mvdbeek
changed the title
mvdbeek
changed the title
|
Agreed with @nsoranzo - this is really nice! What a better separation of concerns - very crisp. 💯 |
This should avoid some complexities associated with managing threads.