summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redis-shutdown4
-rw-r--r--redis.spec5
2 files changed, 6 insertions, 3 deletions
diff --git a/redis-shutdown b/redis-shutdown
index e03d9a6..f0abf29 100644
--- a/redis-shutdown
+++ b/redis-shutdown
@@ -15,8 +15,8 @@ fi
CONFIG_FILE="/etc/$SERVICE_NAME.conf"
# Use awk to retrieve host, port from config file
-HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE`
-PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
+HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE | tail -n1`
+PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE | tail -n1`
# Just in case, use default host, port
HOST=${HOST:-127.0.0.1}
diff --git a/redis.spec b/redis.spec
index 5ada64a..e5fb268 100644
--- a/redis.spec
+++ b/redis.spec
@@ -26,7 +26,7 @@
Name: redis
Version: 3.0.3
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: A persistent key-value database
Group: Applications/Databases
@@ -258,6 +258,9 @@ fi
%changelog
+* Wed Aug 5 2015 Remi Collet <remi@fedoraproject.org> - 3.0.3-1.1
+- make redis-shutdown more robust, see #22
+
* Fri Jul 17 2015 Remi Collet <remi@fedoraproject.org> - 3.0.3-1
- Redis 3.0.3 - Release date: 17 Jul 2015
- Upgrade urgency: LOW for Redis and Sentinel.