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

Proposed by Ted Gould
Status: Rejected
Rejected by: dobey
Proposed branch: lp:~ted/ubuntu-app-launch/no-error-on-root-processes
Merge into: lp:ubuntu-app-launch/rtm-14.09
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
Review via email: mp+242541@code.launchpad.net

Commit message

Remove reporting a recoverable problem on cgmanager

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
Revision history for this message
dobey (dobey) wrote :

Set this to rejected because it's almost 2 years old, and the target branch is no longer supported.

Unmerged revisions

179. By Ted Gould

Remove reporting a recoverable problem on cgmanager

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'helpers-shared.c'
--- helpers-shared.c 2014-11-11 22:05:30 +0000
+++ helpers-shared.c 2014-11-21 20:40:41 +0000
@@ -98,22 +98,6 @@
98 return keyfile;98 return keyfile;
99}99}
100100
101/* Quick way to get the pid of cgmanager to report a bug on it */
102static GPid
103discover_cgmanager_pid (void)
104{
105 gchar * outbuf = NULL;
106 GPid outpid = 0;
107
108 if (g_spawn_command_line_sync("pidof cgmanager", &outbuf, NULL, NULL, NULL)) {
109 outpid = g_ascii_strtoull(outbuf, NULL, 10);
110 }
111
112 g_free(outbuf);
113
114 return outpid;
115}
116
117/* Structure to handle data for the cgmanager connection101/* Structure to handle data for the cgmanager connection
118 set of callbacks */102 set of callbacks */
119typedef struct {103typedef struct {
@@ -127,16 +111,10 @@
127static gboolean111static gboolean
128cgroup_manager_connection_timeout_cb (gpointer data)112cgroup_manager_connection_timeout_cb (gpointer data)
129{113{
130 GPid cgmanager_pid = 0;
131 cgm_connection_t * connection = (cgm_connection_t *)data;114 cgm_connection_t * connection = (cgm_connection_t *)data;
132115
133 g_cancellable_cancel(connection->cancel);116 g_cancellable_cancel(connection->cancel);
134117
135 cgmanager_pid = discover_cgmanager_pid();
136 if (cgmanager_pid != 0) {
137 report_recoverable_problem("ubuntu-app-launch-cgmanager-connection-timeout", cgmanager_pid, FALSE, NULL);
138 }
139
140 return G_SOURCE_CONTINUE;118 return G_SOURCE_CONTINUE;
141}119}
142120

Subscribers

People subscribed via source and target branches