Attachment 291870 Details for Bug 428998 – patch for /etc/init.d/squid, parse and check before attempting to start

[patch] patch for /etc/init.d/squid, parse and check before attempting to start

squid-init-parse.diff (text/plain), 1.59 KB, created by Mads Kiilerich on 2008-01-16 17:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mads Kiilerich

Created: 2008-01-16 17:53:27 UTC

Size: 1.59 KB

patch

obsolete

>--- /etc/init.d/squid.org	2008-01-16 18:36:16.000000000 +0100
>+++ /etc/init.d/squid	2008-01-16 18:49:36.000000000 +0100
>@@ -60,28 +60,32 @@
> }    
> 
> start() {
>-	probe
>+    probe
> 
>-    for adir in $CACHE_SWAP; do
>-		if [ ! -d $adir/00 ]; then 
>-			 echo -n "init_cache_dir $adir... "
>-			 $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
>-		fi
>-    done
>-    echo -n $"Starting $prog: "
>-    $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1
>+    $SQUID -k parse
>     RETVAL=$?
>-    if [ $RETVAL -eq 0 ]; then 
>-       timeout=0;
>-       while : ; do
>-          [ ! -f /var/run/squid.pid ] || break
>-	  if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
>-	     RETVAL=1
>-	     break
>-	  fi
>-	  sleep 1 && echo -n "."
>-	  timeout=$((timeout+1))
>-       done
>+    if [ $RETVAL -eq 0 ]; then
>+        for adir in $CACHE_SWAP; do
>+            if [ ! -d $adir/00 ]; then 
>+                 echo -n "init_cache_dir $adir... "
>+                 $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
>+            fi
>+        done
>+        echo -n $"Starting $prog: "
>+        $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1
>+        RETVAL=$?
>+        if [ $RETVAL -eq 0 ]; then 
>+            timeout=0;
>+            while : ; do
>+                [ ! -f /var/run/squid.pid ] || break
>+                if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
>+                    RETVAL=1
>+                    break
>+                fi
>+                sleep 1 && echo -n "."
>+                timeout=$((timeout+1))
>+            done
>+        fi
>     fi
>     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID
>     [ $RETVAL -eq 0 ] && echo_success

Actions: View | Diff

Attachments on bug 428998: 291870