make redis-shutdown more robust, fix #22

remicollet · Aug 5, 2015 · a1bdf43 · a1bdf43
1 parent 200a689
commit a1bdf43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/redis/redis-shutdown b/redis/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/redis.spec b/redis/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.