Merge lp:~vorlon/ubuntu-touch-session/pulseaudio-expect-daemon into lp:ubuntu-touch-session

Proposed by Steve Langasek
Status: Merged
Approved by: Loïc Minier
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~vorlon/ubuntu-touch-session/pulseaudio-expect-daemon
Merge into: lp:ubuntu-touch-session
Diff against target: 27 lines (+10/-0)
2 files modified
debian/changelog (+9/-0)
upstart-session/pulseaudio.conf (+1/-0)
To merge this branch: bzr merge lp:~vorlon/ubuntu-touch-session/pulseaudio-expect-daemon
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Oliver Grawert Approve
Review via email: mp+190788@code.launchpad.net

Description of the change

While debugging the upstart memory leak, I noticed the pulseaudio user job
was respawning badly. This fixes the missing 'expect daemon', so the
session init knows how to track pulseaudio reliably.

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

looks good to me

review: Approve
Revision history for this message
Loïc Minier (lool) wrote :

Looks good; thanks for the fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-11 08:42:47 +0000
3+++ debian/changelog 2013-10-12 07:41:55 +0000
4@@ -1,3 +1,12 @@
5+ubuntu-touch-session (0.81) UNRELEASED; urgency=low
6+
7+ * Make the pulseaudio job 'expect daemon', without which the session init
8+ loses track of the process (causing churn as it tries to restart a
9+ process that's already running) and fails to reliably clean it up on
10+ exit.
11+
12+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 12 Oct 2013 00:38:38 -0700
13+
14 ubuntu-touch-session (0.80) saucy; urgency=low
15
16 * Drop duplicate stop line in maliit-server job; stop on stopping unity8 is
17
18=== modified file 'upstart-session/pulseaudio.conf'
19--- upstart-session/pulseaudio.conf 2013-07-04 00:45:52 +0000
20+++ upstart-session/pulseaudio.conf 2013-10-12 07:41:55 +0000
21@@ -5,5 +5,6 @@
22 stop on session-end
23
24 respawn
25+expect daemon
26
27 exec pulseaudio --start --log-target=syslog

Subscribers

People subscribed via source and target branches