Merge lp:~clint-fewbar/ubuntu/natty/squid/no-expect-fork into lp:ubuntu/natty/squid

Proposed by Clint Byrum on 2011-01-11
Status: Merged
Merged at revision: 57
Proposed branch: lp:~clint-fewbar/ubuntu/natty/squid/no-expect-fork
Merge into: lp:ubuntu/natty/squid
Diff against target: 34 lines (+8/-3)
2 files modified
debian/changelog (+7/-0)
debian/squid.upstart (+1/-3)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/natty/squid/no-expect-fork
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2011-01-11 Pending
Review via email: mp+45916@code.launchpad.net

Description of the change

Fixes the bug by dropping expect fork

This does extend the already existing race between squid's started event and it listening for connections. There don't seem to be any blocking operations before the fork, so this race condition is already as long as its going to be, also I'm not aware of any job files that depend on squid's started event before connecting to it.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-27 23:31:35 +0000
+++ debian/changelog 2011-01-11 21:34:15 +0000
@@ -1,3 +1,10 @@
1squid (2.7.STABLE9-2.1ubuntu2) natty; urgency=low
2
3 * Run squid with -N and drop 'expect fork' to prevent HUP's from
4 causing upstart to lose track of squid. (LP: #573853)
5
6 -- Clint Byrum <clint@ubuntu.com> Tue, 11 Jan 2011 10:49:37 -0800
7
1squid (2.7.STABLE9-2.1ubuntu1) natty; urgency=low8squid (2.7.STABLE9-2.1ubuntu1) natty; urgency=low
29
3 * Merge from debian unstable. Remaining changes:10 * Merge from debian unstable. Remaining changes:
411
=== modified file 'debian/squid.upstart'
--- debian/squid.upstart 2010-09-27 12:27:09 +0000
+++ debian/squid.upstart 2011-01-11 21:34:15 +0000
@@ -8,8 +8,6 @@
8 and net-device-up IFACE!=lo)8 and net-device-up IFACE!=lo)
9stop on runlevel[!2345]9stop on runlevel[!2345]
1010
11expect fork
12
13pre-start script11pre-start script
14 if [ -f /etc/default/squid ]; then12 if [ -f /etc/default/squid ]; then
15 . /etc/default/squid13 . /etc/default/squid
@@ -78,5 +76,5 @@
78 . /etc/default/squid76 . /etc/default/squid
79 fi77 fi
8078
81 exec /usr/sbin/squid $SQUID_ARGS79 exec /usr/sbin/squid -N $SQUID_ARGS
82end script80end script

Subscribers

People subscribed via source and target branches

to all changes: