- added waiting 30 seconds while restarting - squid is waiting for clossing

[packages/squid.git] / squid.init

diff --git a/squid.init b/squid.init
index 1b6dc9c136f7cd088d575ca85e2fe886744512b9..a83da7c4e4030466ff89027ed554fbeaab34bbee 100644 (file)
--- a/squid.init
+++ b/squid.init
@@ -28,8 +28,8 @@
 
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
-        msg_Network_Down Squid
-        exit 1
+       msg_network_down Squid
+       exit 1
 fi
 
 # Sanity check
@@ -40,48 +40,54 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/squid ]; then
-               show "Prepare squid cache"
-               busy
-               if [ ! -d $CACHE_SWAP/00 ]; then
-                       squid -z -F &>/dev/null
-               fi
-               deltext;ok
-
                msg_starting Squid
                busy            
-               squid -N $SQUID_OPTS &
-               if ps -C squid >/dev/null 2>&1; then
-                   deltext;ok
-               else
-                   deltext;fail
-               fi
-                RETVAL=$?
-                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
+               daemon $SERVICE_RUN_NICE_LEVEL squid $SQUID_OPTS
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
        else
-           msg_Already_Running Squid
+               msg_already_running Squid
        fi
        ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/squid ]; then
-               msg_stopping squid
-               killproc squid
-               rm -f /var/lock/subsys/squid >/dev/null 2>&1
+               msg_stopping squid
+               killproc squid
+               rm -f /var/lock/subsys/squid >/dev/null 2>&1
        else
-               msg_Not_Running squid
-                exit 1
-        fi
+               msg_not_running squid
+               exit 1
+       fi
        ;;
   restart)
        $0 stop
+       echo -n "Waiting 30 second..."
+       sleep 30
+       echo "done."
        $0 start
        ;;
+  reload)
+       if [ -f /var/lock/subsys/squid ]; then
+               msg_reloading squid
+               busy
+               squid -k reconfigure
+               ok
+       else
+               msg_not_running squid
+               exit 1
+       fi
+       ;;
   status)
        status squid
        exit $?
        ;;
+  init)
+       echo "Initializing squid"
+       squid -z
+       ;;
   *)
-       msg_Usage "$0 {start|stop|status|restart}"
+       msg_usage "$0 {start|stop|status|restart|reload|init}"
        exit 1
 esac