WIP: attempted to support workers shared between pools, but locking

won't allow for this, since you can't wait on messages from a specific
farm.

scripts/galaxy-main

@@ -163,6 +163,7 @@ def find_ini(supplied_ini, galaxy_root):
 
     return guess
 
+# FIXME: probably don't need this now that server names are fixed up in app. Do we really need fine grained control over mule names? Maybe for multihost mules? Do we support multihost mules? Could set the mule server name template in galaxy.ini...
 def set_server_name(server_name):
     default = None if not uwsgi else MULE_SERVER_NAME_DEFAULT
     if not server_name:
@@ -241,7 +242,7 @@ def main():
     args = arg_parser.parse_args()
     if args.log_file:
         os.environ["GALAXY_CONFIG_LOG_DESTINATION"] = os.path.abspath(args.log_file)
-    set_server_name(args.server_name)
+    #set_server_name(args.server_name)
     pid_file = args.pid_file
 
     log.setLevel(logging.DEBUG)

scripts/get_uwsgi_args.py

@@ -12,6 +12,7 @@ from galaxy.config import (
     parse_dependency_options,
 )
 from galaxy.script import main_factory
+from galaxy.util.configdict import parse_config
 
 
 DESCRIPTION = "Script to determine uWSGI command line arguments."
@@ -19,6 +20,9 @@ COMMAND_TEMPLATE = '{virtualenv}--ini-paste {galaxy_ini} --paste-logger --die-on
 
 
 def _get_uwsgi_args(args, kwargs):
+    # FIXME: hardcoded
+    stack_conf = parse_config('config/stack_conf.yml', 'stack', {})
+    # FIXME: these belong in stack conf
     handlerct = int(kwargs.get('job_handler_count', 1))
     pool_name = kwargs.get('job_handler_pool_name', 'job-handlers')
     virtualenv = os.environ.get('VIRTUAL_ENV', None)