opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure web handlers don't become job handlers if handlers section exists

Browse Source 
And add a default pool, so that exisiting job setups that don't specify
a pool (for instance those that previously used db-preassign) will just
continue working.
This commit is contained in:
mvdbeek
2021-04-13 10:13:42 +02:00
parent fddaaec2ae
commit de8ef76092
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web_stack/handlers.py
+2 -2
View File
@@ -251,8 +251,8 @@ class ConfiguresHandlers:
for collection in self.handlers.values():
if self.app.config.server_name in collection:
return True
if not self.handlers and (not self.handler_assignment_methods_configured
and HANDLER_ASSIGNMENT_METHODS.DB_TRANSACTION_ISOLATION in self.handler_assignment_methods
if not self.handlers and not self.handler_assignment_methods_configured \
and (HANDLER_ASSIGNMENT_METHODS.DB_TRANSACTION_ISOLATION in self.handler_assignment_methods
or HANDLER_ASSIGNMENT_METHODS.DB_SKIP_LOCKED in self.handler_assignment_methods):
return True
return False
scripts/galaxy_main.py
+1 -1
View File
@@ -194,7 +194,7 @@ class GalaxyConfigBuilder:
arg_parser.add_argument("--log-file", default=None, help="Galaxy log file (overrides log configuration in config_file if set)")
arg_parser.add_argument("--pid-file", default=DEFAULT_PID, help="pid file (default is %s)" % DEFAULT_PID)
arg_parser.add_argument("--server-name", default=None, help="set a galaxy server name")
arg_parser.add_argument("--attach-to-pool", action="append", default=None, help="attach to asynchronous worker pool (specify multiple times for multiple pools)")
arg_parser.add_argument("--attach-to-pool", action="append", default=['job-handlers'], help="attach to asynchronous worker pool (specify multiple times for multiple pools)")
@property
def config_is_ini(self):