Commit Graph
37 Commits
Author SHA1 Message Date
mvdbeek e865741092 Adjust galaxy-main script so we can import from it for easy app setup 2020-12-22 11:18:00 +01:00
Nicola Soranzo 9d74bba7fb Drop support for retired Python 3.5
Upgrade syntax using `pyupgrade --py36-plus` .

Manually drop several `six` imports.

Also:
- Remove broken pr_cache in scripts/bootstrap_history.py
- Fix broken prefix removal in lib/galaxy/tool_util/deps/mulled/mulled_build.py
2020-10-07 11:52:13 +01:00
Dannon Baker 8d17fafa4e Missed one new style class here. 2020-06-26 08:20:49 -04:00
mvdbeek 51549d0391 Only build toolbox index for webapps, delay until after startup 2020-04-25 20:40:26 +02:00
mvdbeek a820e52f2a Fix missed control_worker->queue_worker rename
Missed that one in 6b52f62fe4
2019-08-22 10:58:01 +02:00
Nate Coraor d65e3c904e Fix galaxy-main running from source now that setup,py is no longer in the root 2019-07-07 18:23:49 +02:00
Nate Coraor 37522f5e8e Merge branch 'dev' of https://github.com/galaxyproject/galaxy into installable 2019-07-05 16:05:17 +02:00
Nate Coraor cdb9040e26 Merge remote-tracking branch 'origin/dev' into installable 2019-07-05 15:51:15 +02:00
John Chilton 584c117df3 Refactor to cleanup dependencies around galaxy.web.stack.
Move galaxy.web.stack.database_heartbeat into galaxy.model - since it was the only thing in galaxy.web.stack that used galaxy.model at all and it didn't import anything else from galaxy.web.stack.

Once that was done, I refactored this whole package (galaxy.web.stack) into galaxy.web_stack. It doesn't use the framework setup or exported by the base galaxy.web package so it wouldn't seem to belong there. It also has very different dependencies than the rest of that. And finally and most importantly, this elimiantes almost all dependency from galaxy.jobs and galaxy.tools and galaxy.workflows to anything in galaxy.web.
2019-06-26 18:54:52 -04:00
mvdbeek c8392299c8 Make processes and mules report heartbeat in database
It's important to not set the DatabaseHeartbeat `server_name` prior to forking,
which we avoid be getting `server_name` from
`application_stack.app.config.server_name`.
`WorkerProcess.server_name` for uwsgi web processes will look like:
`main.web.1` and mules like `main.job-handlers.1` while webless workers
remain named `handler1`.
2019-03-29 21:46:18 +01:00
Nate Coraor 473210714e Add support for dynamic handlers when using DB serialization handler assignment 2018-12-18 13:34:31 -05:00
Nicola Soranzo 923ed2ed49 Simplify importing from galaxy lib 2018-09-05 19:47:48 +01:00
Nate Coraor 4ed9df9a94 Set config builder attributes before they're referenced in app_kwds() 2018-08-27 14:03:39 -04:00
Nate Coraor 51b4def4ec Allow running scripts/galaxy-main without Galaxy on $PYTHONPATH 2018-08-27 13:56:13 -04:00
mvdbeek 344f68ea6d py3: Fix uwsgi mule startup 2018-08-14 14:56:07 +02:00
John Chilton 5f3f792f6f Unification of Galaxy configuration parsing for scripts/* 2018-03-23 16:14:49 -04:00
Nate Coraor c720af066b Attempt to log startup as late as possible 2018-03-22 21:43:26 -04:00
Nate Coraor 44c291bc66 Merge remote-tracking branch 'origin/dev' into ini_to_yaml_config 2018-01-18 12:30:05 -05:00
Nicola Soranzo 14259b11d9 Python3: finish first pass on whole codebase 2017-12-14 12:01:01 +00:00
John Chilton 7bae23e105 yaml_config - update code base for converting galaxy.ini.sample to YAML. 2017-12-06 20:28:20 -05:00
Nate Coraor 49158ba38b Add multi-farm support to the main script 2017-11-17 17:09:36 -05:00
Nate Coraor b4863b2df8 Fix lint errors 2017-11-17 13:59:25 -05:00
Nate Coraor 1ec960bcf6 Improve shutdown cleanliness under uWSGI. 2017-11-17 13:52:24 -05:00
Nate Coraor c18521d7f7 Move signal handling from uWSGI stack to main 2017-11-17 13:51:13 -05:00
Nate Coraor b75583ea26 Fix post-merge lint issues 2017-11-09 14:00:46 -05:00
Nate Coraor 09feaf6f4d - Do all logging configuration other than paste fileConfig logging from
dictConfig. Default log message format varies by stack.
- Refactor a lot of file extension handling in to galaxy.util.path.
- Simplify and improve config file finding.
- Simplify and improve native app creation.
- Integrate uWSGI argument generation with @jmchilton's improvements to
  the startup scripts.
- Fix starting without a config file under uWSGI
2017-09-01 01:08:16 -04:00
Nate Coraor 1326a4d671 Cleaning, lint and test fixes. 2017-08-28 16:22:11 -04:00
Nate Coraor aff0a7460e Finish dictConfig logging feature 2017-08-28 14:13:31 -04:00
Nate Coraor 14e9dddade WIP: support log configuration from yaml/json app config with
logging.config.dictConfig. Still working on yaml/json config loading in
the webless app.
2017-08-28 09:54:21 -04:00
Nate Coraor 68542b615c Remove unneeded server_name manipulation from galaxy-main script 2017-08-21 21:57:56 -04:00
Nate Coraor 27a0b1ba40 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.
2017-08-21 21:48:01 -04:00
Nate Coraor ece3f242fb Abandoning unprogrammed mules (for now), fixes for programmed mules 2017-08-21 21:46:39 -04:00
Nate Coraor 092a6b4923 WIP uWSGI mule job handlers - it works! 2017-08-21 21:39:30 -04:00
Nicola Soranzo 527e332aa3 Fix a bunch of errors reported by Sphinx 2016-10-24 19:42:19 +01:00
Nate Coraor 1843c9b3b6 Fix galaxy-main 2016-07-07 13:49:27 -04:00
Nicola Soranzo 93348e7199 Fix the remaining 1334 flake8 errors in scripts/ . Close #391. 2016-02-18 15:45:15 +00:00
Nate Coraor b7c8a6d334 Rename lib/galaxy/main.py to scripts/galaxy-main since that makes more
sense and doesn't result in lib/galaxy/ being added to sys.path.

Create a symlink at lib/galaxy/main.py for backward compatibility.
2015-10-27 16:03:33 -04:00