-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change: Don't fork gsad during container startup
Log all output of gsad to stderr, run gsad in foreground (don't fork) and write output via tee to /var/log/gvm/gsad.log. This simplifies the statup of gsad within the container and actually the running daemon process is tracked by docker instead of the tail process.
- Loading branch information
1 parent
89f758a
commit eeb55a0
Showing
2 changed files
with
6 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
#!/bin/sh | ||
|
||
[ -z "$GSAD_ARGS" ] && GSAD_ARGS="--http-only" | ||
[ -z "$GSAD_ARGS" ] && GSAD_ARGS="-f --http-only" | ||
|
||
echo "starting gsad" | ||
gsad $GSAD_ARGS || | ||
(cat /var/log/gvm/gsad.log && exit 1) | ||
|
||
tail -f /var/log/gvm/gsad.log | ||
gsad $GSAD_ARGS 2>&1 | tee /var/log/gvm/gsad.log |