From d77dc45e7eee74a7c39e850070103fcbbc8f38b0 Mon Sep 17 00:00:00 2001
From: HuabingZhao <zhao.huabing@zte.com.cn>
Date: Wed, 28 Feb 2018 11:10:50 +0800
Subject: Support IP Hash LB policy

Issue-ID: MSB-154
Change-Id: I11b8e3a314c6045183971bf2207b9ccee7df10c2
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
---
 redis-ext/src/assembly/resources/linux/redis/run.sh  | 12 +++---------
 redis-ext/src/assembly/resources/linux/redis/stop.sh | 13 +++++--------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'redis-ext/src/assembly/resources')

diff --git a/redis-ext/src/assembly/resources/linux/redis/run.sh b/redis-ext/src/assembly/resources/linux/redis/run.sh
index 4217ca3..5a4d917 100644
--- a/redis-ext/src/assembly/resources/linux/redis/run.sh
+++ b/redis-ext/src/assembly/resources/linux/redis/run.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright (C) 2017-2018 ZTE, Inc. and others. All rights reserved. (ZTE)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ DIRNAME=`dirname $0`
 HOME=`cd $DIRNAME/; pwd`
 _REDISCMD="$HOME/redis-server"
 _REDISCONF="$HOME/conf/redis.conf"
-_BGREWRITEAOF="$HOME/BGREWRITEAOF.sh"
+
 REDIS_WORKS=$HOME/../redis-works
 
 if [ ! -d "$REDIS_WORKS" ]; then 
@@ -29,12 +29,6 @@ mkdir "$REDIS_WORKS"
 fi 
 
 
-if [ -n "${APIGATEWAY_MODE}" -a -n "${APIGATEWAY_REDIS_PORT}" ]; then
-        sed -i 's/port 6379/port '${APIGATEWAY_REDIS_PORT}'/g' $_REDISCONF
-        sed -i 's/redis_6379/redis_'${APIGATEWAY_REDIS_PORT}'/g' $_REDISCONF
-        sed -i 's/-p 6379/-p '${APIGATEWAY_REDIS_PORT}'/g' $_BGREWRITEAOF
-fi
-
 echo =========== Redis config info  =============================================
 echo Redis_HOME=$HOME
 echo config file=$_REDISCONF
@@ -43,4 +37,4 @@ echo ===========================================================================
 cd $HOME; pwd
 
 echo @C_CMD@ $_REDISCMD $_REDISCONF
-$_REDISCMD $_REDISCONF
\ No newline at end of file
+$_REDISCMD $_REDISCONF
diff --git a/redis-ext/src/assembly/resources/linux/redis/stop.sh b/redis-ext/src/assembly/resources/linux/redis/stop.sh
index d266b42..8c4ab93 100644
--- a/redis-ext/src/assembly/resources/linux/redis/stop.sh
+++ b/redis-ext/src/assembly/resources/linux/redis/stop.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright (C) 2017-2018 ZTE, Inc. and others. All rights reserved. (ZTE)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,12 +22,9 @@ _REDISCLIENT="$HOME/redis-cli"
 
 echo ===================== Redis info  =============================================
 echo Redis_HOME=$HOME
-echo TIP:This shell script close the Redis instance!
+echo TIP:This shell script close the Redis instance listening on 6379!
 echo ===============================================================================
 cd $HOME; pwd
-_REDIS_PORT="6379"
-if [ -n "${APIGATEWAY_MODE}" -a -n "${APIGATEWAY_REDIS_PORT}" ]; then
-         _REDIS_PORT=${APIGATEWAY_REDIS_PORT}
-fi
-echo @C_CMD@ $_REDISCLIENT  -p $_REDIS_PORT shutdown
-$_REDISCLIENT  -p $_REDIS_PORT shutdown
\ No newline at end of file
+
+echo @C_CMD@ $_REDISCLIENT  -p 6379 shutdown
+$_REDISCLIENT  -p 6379 shutdown
-- 
cgit