Commit Graph
30 Commits
Author SHA1 Message Date
Nate Coraor 096c75a1fb No magic arg getter for gunicorn means we have to explicitly pass the
sample config if necessary
2022-01-24 14:00:56 -05:00
Nicola Soranzo 04ccca1434 Remove broken code
`scripts/build_universe_config.py` was removed in commit
9b287ef06c
2020-05-13 19:30:49 +01:00
Nicola Soranzo fbd2284e5d Fix PID file handling for gunicorn
gunicorn uses `--pid`, not `--pid-file`.
2018-11-15 11:27:14 +01:00
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 102566dd5e Update Galaxy Reports 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/reports.yml.sample).
2017-08-10 13:15:30 -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
John Chilton 438661e894 Another fix for virtualenv fixes. 2016-03-10 14:34:00 +00: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
Dannon Baker f35bd9ae02 Merge pull request #1181 from souravsingh/rename_file
Renames reports_wsgi.ini
2015-11-30 11:49:41 -05:00
Sourav Singh 9e353028d5 Updated run_reports.sh
Updated run_reports.sh to mark the latest changes.
2015-11-30 20:05:15 +05:30
Sourav Singh 7b85684683 Updated run_reports.sh
Updated run_reports.sh to reflect new changes.
2015-11-29 00:35:32 +05:30
Sourav Singh a366835596 Changed reports_wsgi.ini to reports.ini 2015-11-27 23:47:52 +05:30
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
Martin Cech 51b295ac0b typo 2014-11-04 13:58:42 -05:00
Martin Cech 479ac033f3 teach reports app to find its new config file 2014-11-04 13:38:24 -05:00
Lance Parsons 29d56e518d Source virtualenv before python check and for reports app 2014-09-04 15:12:04 -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
John Chilton c3e99bc384 Improvements to reports management script (run_reports.sh) to enable managing the reports app from CloudMan. These enhancements are all "optional", the default behavior of run_reports.sh is unchanged.
Added flag (--sync-config) to run_reports.sh script that will cause it to synchronize the database connection and file path properties in reports_wsgi.ini with those in universe_wsgi.ini prior to starting paster app.

Allow specification of reports configuration directory mirroring similar extensions previously accepted for universe config and run.sh

Added usage documentation to run_reports.sh.

Added extension points to tweak pid and log location for reports application via environment variables.
2012-09-21 22:04:15 -05:00
Nate Coraor 006716f53a Egg support overhaul, introduces a number of fixes to the ABI recognition, better build scripts, a rewrite of the eggs library and eliminition of the need for python -ES 2010-03-01 15:41:30 -05:00
Nate Coraor 1f5e079a3a python run from virtualenv sets up site.py to pull things from the real python's lib directory, so 'python -S' breaks it. To fix this, have the check_python.py script check for virtualenv and output the arguments that should be used to start python ('python -E' for virtualenv, 'python -ES' for real), then use these arguments anywhere 'python -ES' was used in the past. 2010-01-04 12:51:34 -05:00
Greg Von Kuster fa89dda270 Fix for current month's job report. 2008-05-23 14:13:01 +00:00
Greg Von Kuster 9b94d253d9 Added new current month's jobs report, all reports now use mako templates. 2008-05-23 13:51:31 +00:00
Greg Von Kuster af3b0669aa Eliminated all Python2.4 references, added necessary assert statements to ensure minimum version of Python 2.4. 2008-03-28 15:24:50 +00:00
Greg Von Kuster 3b1ba684da Fixed command line and port for reports. 2008-01-14 16:29:27 +00:00
Greg Von Kuster 01378424b4 New reports app server and 1st report showing disk usage for dataset file system - still need to mess with styles a bit.
Also fixed update_dataset_size script and delete deprecatd random_intervals code file.
2008-01-11 21:24:21 +00:00