opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5226 from nsoranzo/fix_paster.log_pid

Browse Source 
paster.pid/log to galaxy.pid/log reference update
This commit is contained in:
John Chilton
2017-12-15 12:02:44 -05:00
committed by GitHub
parent 5b6eaac4a0 18221ae931
commit 7e7dc249ab
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/first_startup.sh
+2 -2
View File
@@ -10,7 +10,7 @@ bash run.sh --daemon && \
sleep 1
i=$((i + 1))
done
kill -9 "$(cat paster.pid)"
kill -9 "$(cat galaxy.pid)"
echo "exit code:$EXIT_CODE, showing startup log:"
cat paster.log
cat galaxy.log
exit $EXIT_CODE
contrib/galaxy.fedora-init
+1 -1
View File
@@ -59,7 +59,7 @@ galaxy_status() {
if [[ $(grep '\[server:' $RUN_IN/config/galaxy.ini|awk -F'(:)|(])' '{ print $2 }') == 'main' ]]
then
echo -n "$SERVICE_NAME status: "
status -p $RUN_IN/paster.pid galaxy
status -p $RUN_IN/galaxy.pid galaxy
else
for proc in $(grep '\[server:' $RUN_IN/config/galaxy.ini|awk -F'(:)|(])' '{ print $2 }')
do
doc/source/admin/production.md
+1 -1
View File
@@ -21,7 +21,7 @@ Many of the following instructions are best practices for any production applica
* Create a **NON-ROOT** user called galaxy. Running as an existing user will cause problems down the line when you want to grant or restrict access to data.
* Start with a fresh checkout of Galaxy, don't try to convert one previously used for development. Download and install it in the galaxy user home directory.
* Galaxy should be a managed system service (like Apache, mail servers, database servers, *etc.*) run by the galaxy user. Init scripts, OS X launchd definitions and Solaris SMF manifests are provided in the `contrib/` directory of the distribution. You can also use the `--daemon` and `--stop-daemon` arguments to `run.sh` to start and stop by hand, but still run detached. When running as a daemon the server's output log will be written to `paster.log` instead of the terminal, unless instructed otherwise with the `--log-file` argument.
* Galaxy should be a managed system service (like Apache, mail servers, database servers, *etc.*) run by the galaxy user. Init scripts, OS X launchd definitions and Solaris SMF manifests are provided in the `contrib/` directory of the distribution. You can also use the `--daemon` and `--stop-daemon` arguments to `run.sh` to start and stop by hand, but still run detached. When running as a daemon the server's output log will be written to `galaxy.log` instead of the terminal, unless instructed otherwise with the `--log-file` argument.
* Give Galaxy its own database user and database to prevent Galaxy's schema from conflicting with other tables in your database. Also, restrict Galaxy's database user so it only has access to its own database.
* Make sure Galaxy is using a clean Python interpreter. Conflicts in $PYTHONPATH or the interpreter's `site-packages/` directory could cause problems. Galaxy manages its own dependencies for the framework, so you do not need to worry about these. The easiest way to do this is with a [virtualenv](http://pypi.python.org/pypi/virtualenv):
scripts/summarize_timings.py
+1 -1
View File
@@ -15,7 +15,7 @@ TIMING_LINE_PATTERN = re.compile("\((\d+.\d+) ms\)")
def main(argv=None):
"""Entry point for script."""
arg_parser = ArgumentParser(description=DESCRIPTION)
arg_parser.add_argument("--file", default="paster.log")
arg_parser.add_argument("--file", default="galaxy.log")
arg_parser.add_argument("--print_lines", default=False, action="store_true")
arg_parser.add_argument("--pattern", default=None)