artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 17:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove stdout/stderr redirection from jaeger (#25538)

Browse Source 
This commit removes the redirection of stdout/stderr from jaeger when
running in sg. This was causing the bash process that spawned jaeger to
stick around as its parent process, which would catch the kill signal
from a canceled context and not kill its child jaeger process. This
caused jaeger to not be cleaned up on a failed sg start or a panic,
which meant it had to be manually killed if you wanted to restart.
This commit is contained in:
Camden Cheek 2021-09-30 01:43:04 -06:00 committed by GitHub
parent cfdb1b7b33
commit e44b7070db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sg.config.yaml
View File

@ -519,10 +519,9 @@ commands:
jaeger:
cmd: |
.bin/jaeger-all-in-one-${JAEGER_VERSION}-$(go env GOOS)-$(go env GOARCH) --log-level ${JAEGER_LOG_LEVEL} >> "${JAEGER_LOGS}"/jaeger.log 2>&1
.bin/jaeger-all-in-one-${JAEGER_VERSION}-$(go env GOOS)-$(go env GOARCH) --log-level ${JAEGER_LOG_LEVEL}
install: |
mkdir -p "${JAEGER_DISK}"
mkdir -p "${JAEGER_LOGS}"
suffix="${JAEGER_VERSION}-$(go env GOOS)-$(go env GOARCH)"
target="$PWD/.bin/jaeger-all-in-one-${suffix}"
@ -538,7 +537,6 @@ commands:
env:
JAEGER_VERSION: 1.18.1
JAEGER_DISK: $HOME/.sourcegraph-dev/data/jaeger
JAEGER_LOGS: $HOME/.sourcegraph-dev/logs/jaeger
JAEGER_LOG_LEVEL: info
QUERY_BASE_PATH: /-/debug/jaeger