Fix redis-shutdown on multiple NIC setup (RHBZ #1201237)

This commit is contained in:
Haikel Guemar 2015-03-26 23:59:51 +01:00
parent 1cd925bb3b
commit 9ac97d7a24
2 changed files with 9 additions and 4 deletions

View File

@ -14,10 +14,12 @@ fi
# Get the proper config file based on service name # Get the proper config file based on service name
CONFIG_FILE="/etc/$SERVICE_NAME.conf" CONFIG_FILE="/etc/$SERVICE_NAME.conf"
# Use awk to retrieve port from config file # 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` PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE`
# Just in case, use default port # Just in case, use default host, port
HOST=${HOST:-127.0.0.1}
if [ "$SERVICE_NAME" = redis ]; then if [ "$SERVICE_NAME" = redis ]; then
PORT=${PORT:-6379} PORT=${PORT:-6379}
else else
@ -25,4 +27,4 @@ else
fi fi
# shutdown the service properly # shutdown the service properly
$REDIS_CLI -p $PORT shutdown $REDIS_CLI -h $HOST -p $PORT shutdown

View File

@ -12,7 +12,7 @@
Name: redis Name: redis
Version: 2.8.19 Version: 2.8.19
Release: 1%{?dist}.1 Release: 2%{?dist}
Summary: A persistent key-value database Summary: A persistent key-value database
License: BSD License: BSD
URL: http://redis.io URL: http://redis.io
@ -242,6 +242,9 @@ fi
%changelog %changelog
* Thu Mar 26 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-2
- Fix redis-shutdown on multiple NIC setup (RHBZ #1201237)
* Fri Feb 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-1 * Fri Feb 27 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 2.8.19-1
- Upstream 2.8.19 (RHBZ #1175232) - Upstream 2.8.19 (RHBZ #1175232)
- Fix permissions for tmpfiles (RHBZ #1182913) - Fix permissions for tmpfiles (RHBZ #1182913)