summaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorJon Bratseth <jonbratseth@yahoo.com>2016-07-07 23:22:04 +0200
committerGitHub <noreply@github.com>2016-07-07 23:22:04 +0200
commitbf3713546c3ba93ae4bc58979e07da10b5648e91 (patch)
treed803a8c4db794592bea2762eab4fdc71bf9f35e8 /vespabase
parent7c76031003369966994ce2a658fede8c985155a2 (diff)
parent88fa0120dc7bfda77f346290c84ffc24db45ca84 (diff)
Merge pull request #327 from yahoo/arnej/enable-yjava-daemon-again-2
Arnej/enable yjava daemon again 2
Diffstat (limited to 'vespabase')
-rwxr-xr-xvespabase/src/common-env.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh
index d2e30ec3368..a2c55439a3f 100755
--- a/vespabase/src/common-env.sh
+++ b/vespabase/src/common-env.sh
@@ -236,12 +236,20 @@ getJavaOptionsIPV46() {
fi
}
+log_message () {
+ msg_log_level="info"
+ case $1 in
+ error|warning|info|event|config|debug|spam) msg_log_level=$1; shift;;
+ esac
+ printf "%s\t%s\t%s\n" $$ $msg_log_level "$*"
+}
+
log_debug_message () {
- if [ -n "$YINST_RUNNING" ]; then
- echo "debug $*" 1>&2
+ if [ "$YINST_RUNNING" ]; then
+ log_message "debug" "$*"
fi
}
log_warning_message () {
- echo "warning $*" 1>&2
+ log_message "warning" "$*" 1>&2
}