You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/05 23:04:22 UTC
[26/50] [abbrv] ambari git commit: AMBARI-22647. ADDENDUM -Rafactor:
Package Log Search and Log Feeder into jars + cleanup start scripts
(oleewere)
AMBARI-22647. ADDENDUM -Rafactor: Package Log Search and Log Feeder into jars + cleanup start scripts (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85ef6119
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85ef6119
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85ef6119
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 85ef6119d808563adcc5989a245242368bc220de
Parents: df19a69
Author: Oliver Szabo <ol...@gmail.com>
Authored: Mon Dec 18 22:01:09 2017 +0100
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jan 5 17:54:16 2018 -0500
----------------------------------------------------------------------
.../src/main/resources/logfeeder.properties | 5 +----
.../src/main/scripts/logfeeder.sh | 17 ++++++++---------
.../src/main/scripts/logsearch.sh | 17 ++++++++---------
ambari-logsearch/docker/bin/start.sh | 9 +++++----
4 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef6119/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties
index 4b49446..5217309 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/resources/logfeeder.properties
@@ -23,9 +23,8 @@ logfeeder.config.files=${LOGFEEDER_RELATIVE_LOCATION:}target/classes/log-samples
${LOGFEEDER_RELATIVE_LOCATION:}target/classes/log-samples/shipper-conf/output.config-sample.json
logfeeder.log.filter.enable=true
+logfeeder.include.default.level=FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN
-logfeeder.solr.config.interval=5
-logfeeder.solr.core.config.name=history
logfeeder.solr.zk_connect_string=localhost:2181
logfeeder.cache.enabled=true
@@ -34,7 +33,5 @@ logfeeder.cache.key.field=log_message
logfeeder.cache.dedup.interval=1000
logfeeder.cache.last.dedup.enabled=true
-logfeeder.include.default.level=FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN
-
#logfeeder tmp dir
logfeeder.tmp.dir=${LOGFEEDER_RELATIVE_LOCATION:}target/tmp
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef6119/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
index cfacea5..5f4edea 100755
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
@@ -119,27 +119,26 @@ function spinner() {
}
function status() {
- echo "Checking Log Feeder status ..."
+ echo "Checking Log Feeder status ..." >&2
if [ -f "$LOGFEEDER_PID_FILE" ]; then
LOGFEEDER_PID=`cat "$LOGFEEDER_PID_FILE"`
else
- echo "Log Feeder pid not exists. (probably the process is not running)"
- exit 1
+ echo "Log Feeder pid not exists. (probably the process is not running)" >&2
+ return 1
fi
if ps -p $LOGFEEDER_PID > /dev/null
then
- echo "Log Feeder process is running. (pid: $LOGFEEDER_PID)"
- exit 0
+ echo "Log Feeder process is running. (pid: $LOGFEEDER_PID)" >&2
+ return 0
else
- echo "Log Feeder process is not running."
- exit 1
+ echo "Log Feeder process is not running." >&2
+ return 1
fi
}
function start() {
- (status);
- exit_status=$(echo $?)
+ exit_status=$(status; echo $?)
if [ "$exit_status" = "0" ]; then
echo "Skipping start process."
exit 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef6119/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
index 128617c..8439065 100755
--- a/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -109,27 +109,26 @@ function spinner() {
}
function status() {
- echo "Checking Log Search status ..."
+ echo "Checking Log Search status ..." >&2
if [ -f "$LOGSEARCH_PID_FILE" ]; then
LOGSEARCH_PID=`cat "$LOGSEARCH_PID_FILE"`
else
- echo "Log Search pid not exists. (probably the process is not running)"
- exit 1
+ echo "Log Search pid not exists. (probably the process is not running)" >&2
+ return 1
fi
if ps -p $LOGSEARCH_PID > /dev/null
then
- echo "Log Search process is running. (pid: $LOGSEARCH_PID)"
- exit 0
+ echo "Log Search process is running. (pid: $LOGSEARCH_PID)" >&2
+ return 0
else
- echo "Log Search process is not running."
- exit 1
+ echo "Log Search process is not running." >&2
+ return 1
fi
}
function start() {
- (status);
- exit_status=$(echo $?)
+ exit_status=$(status; echo $?)
if [ "$exit_status" = "0" ]; then
echo "Skipping start process."
exit 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ef6119/ambari-logsearch/docker/bin/start.sh
----------------------------------------------------------------------
diff --git a/ambari-logsearch/docker/bin/start.sh b/ambari-logsearch/docker/bin/start.sh
index f2acf9b..6ba20fb 100644
--- a/ambari-logsearch/docker/bin/start.sh
+++ b/ambari-logsearch/docker/bin/start.sh
@@ -46,7 +46,7 @@ function create_logfeeder_configs() {
}
function create_logsearch_configs() {
- mkdir /root/config/logsearch
+ mkdir -p /root/config/logsearch
cp /root/test-config/logsearch/log4j.xml /root/config/logsearch/
cp /root/test-config/logsearch/logsearch-env.sh /root/config/logsearch/
cp $LOGSEARCH_SERVER_PATH/conf/user_pass.json /root/config/logsearch/user_pass.json
@@ -148,7 +148,7 @@ function main() {
case $component in
"solr")
create_solr_configs
- echo "Start Solr only.."
+ echo "Start Solr only ..."
export COMPONENT_LOG="solr"
generate_keys
start_solr_d
@@ -156,17 +156,18 @@ function main() {
;;
"logfeeder")
create_logfeeder_configs
- echo "Start Log Feeder only.."
+ echo "Start Log Feeder only ..."
export COMPONENT_LOG="logfeeder"
generate_keys
start_logfeeder
;;
"logsearch")
create_logsearch_configs
- echo "Start Log Search only.."
+ echo "Start Log Search only ..."
export COMPONENT_LOG="logsearch"
generate_keys
start_logsearch
+ log
;;
*)
create_configs