Merge lp:~ted/ubuntu-app-launch/no-error-on-root-processes into lp:ubuntu-app-launch/15.04

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 179
Merged at revision: 181
Proposed branch: lp:~ted/ubuntu-app-launch/no-error-on-root-processes
Merge into: lp:ubuntu-app-launch/15.04
Diff against target: 42 lines (+0/-22)
1 file modified
helpers-shared.c (+0/-22)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/no-error-on-root-processes
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+242539@code.launchpad.net

Commit message

Remove reporting a recoverable problem on cgmanager

Description of the change

We can't do it, so don't try, just gonna cause heartache.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM.

The amd64 failure doesn't appear to be related to this MP

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helpers-shared.c'
2--- helpers-shared.c 2014-11-18 21:10:34 +0000
3+++ helpers-shared.c 2014-11-21 20:44:55 +0000
4@@ -98,22 +98,6 @@
5 return keyfile;
6 }
7
8-/* Quick way to get the pid of cgmanager to report a bug on it */
9-static GPid
10-discover_cgmanager_pid (void)
11-{
12- gchar * outbuf = NULL;
13- GPid outpid = 0;
14-
15- if (g_spawn_command_line_sync("pidof cgmanager", &outbuf, NULL, NULL, NULL)) {
16- outpid = g_ascii_strtoull(outbuf, NULL, 10);
17- }
18-
19- g_free(outbuf);
20-
21- return outpid;
22-}
23-
24 /* Structure to handle data for the cgmanager connection
25 set of callbacks */
26 typedef struct {
27@@ -127,16 +111,10 @@
28 static gboolean
29 cgroup_manager_connection_timeout_cb (gpointer data)
30 {
31- GPid cgmanager_pid = 0;
32 cgm_connection_t * connection = (cgm_connection_t *)data;
33
34 g_cancellable_cancel(connection->cancel);
35
36- cgmanager_pid = discover_cgmanager_pid();
37- if (cgmanager_pid != 0) {
38- report_recoverable_problem("ubuntu-app-launch-cgmanager-connection-timeout", cgmanager_pid, FALSE, NULL);
39- }
40-
41 return G_SOURCE_CONTINUE;
42 }
43

Subscribers

People subscribed via source and target branches