Commit Graph
21 Commits
Author SHA1 Message Date
Nicola Soranzo aaff474142 Use consistent preference order for config files
1) galaxy.yml
2) galaxy.ini
3) universe_wsgi.ini

Also:
- properly quote variables which may contain spaces
- no need to pass the config file to `./scripts/manage_tool_dependencies.py`
- simplify `scripts/maintenance.sh` by moving the `cd` up and reusing
  functions from `scripts/common_startup_functions.sh`
2018-06-02 03:28:54 +01:00
Nicola Soranzo 0ea8107191 Use separate pid_log_paster_args variable
to store --pid-file and --log-file options of `./scripts/paster.py` .

https://github.com/galaxyproject/galaxy/pull/6239 fixed 3 bugs:

- `GALAXY_RUN_ALL=1 ./run.sh` was reusing the same pid and log files for
  all Galaxy processes;
- `./run.sh restart` was always using `paster.pid` and `paster.log` instead
  of the configured files
- `./run.sh status` was always using `paster.pid`

but also introduced a regression, i.e. the plain `./run.sh` started
writing to the log file instead of the standard output (console).

This fixes the regression by using a separate variable for these options
instead of conflating them in `paster_args` or `server_args`.
2018-06-02 01:09:10 +01: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
John Chilton 90e899d68f Update tool shed to use newer configuration schema.
- Implement kwalify schema to validate/define the schema.
 - Replace ini configuration with YAML (completely backward compatible).
 - Rebuild a sample configuration from the schema (config/tool_shed.yml.sample).
2017-08-10 13:15:29 -04:00
John Chilton 72e5a00ba0 Centralize launching server for reports and tool shed.
Initial outline of allowing launch via uwsgi.
2017-08-10 13:14:55 -04:00
John Chilton 6a7cc34e1b Bring Galaxy, reports, and shed run scripts in sync.
- They now uniformly handle server option processing.
- Reports and Tool Shed now respect many new and important options such as --skip_venv.
- Reports and Tool Shed now do extra checking around Python version that Galaxy does.

In addition to improving the reports and tool shed startup scripts and reducing cognative load with respect to option handling, this is an important pre-condition to us being able us to switch on uwsgi by default for all three services simultaneously without a bunch of copy and pasting.
2017-08-10 13:14:55 -04:00
Nicola Soranzo 6082f79043 Fix path
Broken in #2131.

Reported by @dnbenso at
https://github.com/galaxyproject/galaxy/commit/f2bd242a2c28954215fb84d289d19e35a6460c65#commitcomment-19642191
2016-11-01 14:19:18 +00:00
nitesh1989 f2bd242a2c change run_tool_shed.py to see the file in the correct lcoation 2016-04-11 13:44:51 -04:00
Dave Bouvier ef960a62f7 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into toolshed_decouple 2016-03-30 09:17:43 -04:00
John Chilton 438661e894 Another fix for virtualenv fixes. 2016-03-10 14:34:00 +00:00
Dave Bouvier f60edb952a Show tool panel selector only when needed.
Add the virtualenv to run_tool_shed.sh
2016-03-09 12:50:53 -05:00
John Chilton 5824bc04af Fix duplicate print statement reported by @dannon...
https://github.com/galaxyproject/galaxy/pull/1890#issuecomment-193873380
2016-03-08 12:40:27 +00:00
John Chilton 29c78e984e Fix virtualenv broken with #1847. 2016-03-08 08:42:15 +00:00
John Chilton 26d5561b4f Update more scripts to respect GALAXY_VIRTUAL_ENV.
Drop explicit sourcing in run_reports and run_tool_shed since they source common_startup.
2016-03-03 10:11:24 +00:00
Nate Coraor 367ceae256 Dockerized tests need to create and activate .venv if it does not exist.
Do this by calling common_startup.sh prior to manage_db.sh in
run_test_wrapper.sh. Will require a rebuild of the testing-base image.

Also, have scripts in Galaxy root activate .venv if it exists.
2015-10-16 11:35:52 -04:00
Nate Coraor c7acc3723f Rename tool_shed_wsgi.ini.sample to tool_shed_wsgi.ini, fix static and other errors I created when moving it to config/ in the first place. 2014-09-16 14:55:38 -04:00
John Chilton b53c1ba49e Make run_tool_shed.sh executable. 2014-08-13 22:52:59 -04:00
Dave Bouvier 8b45411adf Abstract common startup tasks into scripts/common_startup.sh, which used to be copy_sample_files.sh. 2014-06-13 16:39:59 -04:00
Dave Bouvier 4f2e506042 Enable running the create_users and create_categories scripts via run_tool_shed.sh 2014-05-22 10:59:18 -04:00
Greg Von Kuster 9f05fec27c I meant to make this file a .sample file. 2014-05-17 10:10:23 -04:00
Greg Von Kuster ae39ab8f2b Rename community_wsgi.ini.sample to be tool_shed_wsgi.ini.sample, run_community.sh to run_tool_shed.sh, and fix references to these files in the code. 2013-03-18 10:24:03 -04:00