Attachment 873215 Details for Bug 1066408 – Updated fix (small tweaks for leading whitespace)

[patch] Updated fix (small tweaks for leading whitespace)

0001-Make-mongod-init-script-intelligent.patch (text/plain), 2.12 KB, created by Lon Hohberger on 2014-03-11 17:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2014-03-11 17:15:59 UTC

Size: 2.12 KB

patch

obsolete

>From 91cb8596e99d5ef40259deb22fca104c715f1a5b Mon Sep 17 00:00:00 2001
>From: Lon Hohberger <lhh@redhat.com>
>Date: Tue, 11 Mar 2014 12:59:14 -0400
>Subject: [PATCH] Make mongod init script intelligent
>
>Signed-off-by: Lon Hohberger <lhh@redhat.com>
>---
> mongod.sysconf |  3 ++-
> mongodb.init   | 38 ++++++++++++++++++++++++++++++++++++++
> 2 files changed, 40 insertions(+), 1 deletion(-)
>
>diff --git a/mongod.sysconf b/mongod.sysconf
>index 5d1d128..b5e5fa5 100644
>--- a/mongod.sysconf
>+++ b/mongod.sysconf
>@@ -1 +1,2 @@
>-MONGODB_OPTIONS="--quiet -f /etc/mongodb.conf"
>+MONGODB_CONFIG="/etc/mongodb.conf"
>+MONGODB_OPTIONS="--quiet -f $MONGODB_CONFIG"
>diff --git a/mongodb.init b/mongodb.init
>index fd033af..b869c2f 100644
>--- a/mongodb.init
>+++ b/mongodb.init
>@@ -15,6 +15,8 @@ logfile="/var/log/mongodb/mongodb.log"
> 
> [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
> 
>+timeout=${MONGODB_START_TIMEOUT-30}
>+configfile=${MONGODB_CONFIG-/etc/mongodb.conf}
> pidfile=${PIDFILE-/var/run/mongodb/mongodb.pid}
> options="$MONGODB_OPTIONS"
> lockfile="/var/lock/subsys/mongod"
>@@ -26,6 +28,18 @@ start() {
>     retval=$?
>     echo
>     [ $retval -eq 0 ] && touch $lockfile
>+
>+    echo -n $"Waiting for $prog to become available: "
>+    while ! rh_status_q; do
>+        if [ $timeout -le 0 ]; then
>+            echo_failure; echo
>+            return 1
>+        fi
>+        sleep 3
>+        ((timeout-=3))
>+    done
>+    echo_success; echo
>+
>     return $retval
> }
> 
>@@ -52,8 +66,32 @@ force_reload() {
> }
> 
> rh_status() {
>+    local p a
>     # run checks to determine if the service is running or use generic status
>     status -p ${pidfile} $prog
>+
>+    # Grab address
>+    a=$(grep '^[[:space:]]*bind_ip' $configfile)
>+    a=${a/*=/}
>+    a=${a/#*/}
>+    [ -z "$a" ] && a=127.0.0.1
>+
>+    # Grab port
>+    p=$(grep '^[[:space:]]*port' $configfile)
>+    p=${p/*=/}
>+    p=${p/#*/}
>+    [ -z "$p" ] && p=27017
>+
>+    netstat -ln | grep -q "$a:$p"
>+    [ $? -eq 0 ] || return 1
>+
>+    echo "listening on $a:$p"
>+
>+    # Check db
>+    mongostat -n 1 -h $a --port $p &> /dev/null
>+    [ $? -ne 0 ] && return 1
>+
>+    echo "connection test successful"
> }
> 
> rh_status_q() {
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1066408: 873213 | 873215 | 888844 | 888909