Merge lp:~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload into lp:ubuntu/natty/squid

[Clint Byrum]

This is the same merge as the one proposed with lucid, except I've removed the check for what version we're upgrading from. Ultimately, this is a useful check no matter what, given that the user could have refused to merge the upstart job file if it has local changes.

I have not tested it as thorougly on natty as I did on lucid, though I did at least check to see that it installs and runs the code appropriately if the squid job has lost track of its squid daemon.

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-11 10:49:37 +0000
+++ debian/changelog	2011-02-16 05:22:55 +0000
@@ -1,3 +1,10 @@
+squid (2.7.STABLE9-2.1ubuntu3) natty; urgency=low
+
+  * Detect and deal with the situation where upstart has lost track of
+    squid. (LP: #717397)
+
+ -- Clint Byrum <[e-mail]>  Tue, 15 Feb 2011 07:00:38 -0800
+
 squid (2.7.STABLE9-2.1ubuntu2) natty; urgency=low
 
   * Run squid with -N and drop 'expect fork' to prevent HUP's from

=== modified file 'debian/preinst'
--- debian/preinst	2010-04-16 09:00:19 +0000
+++ debian/preinst	2011-02-16 05:22:55 +0000
@@ -52,6 +52,36 @@
 	chsh -s /bin/sh proxy
 fi
 
+# Because of this bug:
+# https://bugs.launchpad.net/bugs/573853 
+# Upstart may have lost track of squid. Correct that by using the
+# pid file to stop it and then start the job back up
+if [ "$1" = "upgrade" ] \
+  && [ -f "/var/run/squid.pid" ] \
+  && [ -f "/etc/init/squid.conf" ]
+then
+	SQUID_PID=`cat /var/run/squid.pid`
+	# is this still running, and actually squid
+	if [ -d "/proc/${SQUID_PID}" ] \
+	 && [ "`stat -L -c %D%i /proc/${SQUID_PID}/exe`" = "`stat -L -c %D%i /usr/sbin/squid`" ]
+	then
+		UPSTART_SQUID_PID=`initctl status squid | awk -F'process ' '/start\/running, process / { print $2 }'`
+		PIDFILE_PPID=`awk '{print $4}' /proc/$SQUID_PID/stat`
+		# If the user has disabled expect fork the pids will be the same
+		if [ "$UPSTART_SQUID_PID" != "$SQUID_PID" -a "$PIDFILE_PPID" != "$UPSTART_SQUID_PID" ]
+		then
+			# stop the job
+			if invoke-rc.d squid stop
+			then
+				# kill the pid file pid
+				kill ${SQUID_PID}
+				# start the job again
+				invoke-rc.d squid start
+			fi
+		fi
+	fi
+fi
+
 #DEBHELPER#
 
 exit 0