You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/03/27 09:53:03 UTC

[ambari] branch trunk updated: AMBARI-23364. Cannot stop logsearch/logfeeder properly after ambari upgrade (#788)

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 93b0949  AMBARI-23364. Cannot stop logsearch/logfeeder properly after ambari upgrade (#788)
93b0949 is described below

commit 93b09490e1f0a300ee2ed2d73f7859e390f2438b
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Tue Mar 27 02:53:00 2018 -0700

    AMBARI-23364. Cannot stop logsearch/logfeeder properly after ambari upgrade (#788)
    
    * AMBARI-23364. Cannot stop logsearch/logfeeder properly after ambari upgrade
    
    * AMBARI-23364. Add missing $
---
 .../ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh       | 7 ++++++-
 .../ambari-logsearch-server/src/main/scripts/logsearch.sh          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

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 2d8e229..e750b2a 100755
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
@@ -56,7 +56,12 @@ if [ ! -z "$LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE" ]; then
 fi
 
 if [ -z "$LOGFEEDER_PID_FILE" ]; then
-  LOGFEEDER_PID_DIR=$HOME
+  LOGFEEDER_DEFAULT_PID_DIR="/var/run/ambari-logsearch-logfeeder"
+  if [ -d "$LOGFEEDER_DEFAULT_PID_DIR" ]; then
+    LOGFEEDER_PID_DIR=$LOGFEEDER_DEFAULT_PID_DIR
+  else
+    LOGFEEDER_PID_DIR=$HOME
+  fi
   export LOGFEEDER_PID_FILE=$LOGFEEDER_PID_DIR/logfeeder.pid
 fi
 
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 25e8b09..a51775d 100755
--- a/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -54,7 +54,12 @@ if [ ! -z "$LOGSEARCH_SOLR_CLIENT_SSL_INCLUDE" ]; then
 fi
 
 if [ -z "$LOGSEARCH_PID_FILE" ]; then
-  LOGSEARCH_PID_DIR=$HOME
+  LOGSEARCH_DEFAULT_PID_DIR="/var/run/ambari-logsearch-portal"
+  if [ -d "$LOGSEARCH_DEFAULT_PID_DIR" ]; then
+    LOGSEARCH_PID_DIR=$LOGSEARCH_DEFAULT_PID_DIR
+  else
+    LOGSEARCH_PID_DIR=$HOME
+  fi
   export LOGSEARCH_PID_FILE=$LOGSEARCH_PID_DIR/logsearch.pid
 fi
 

-- 
To stop receiving notification emails like this one, please contact
oleewere@apache.org.