Merge lp:~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode into lp:upstart

Proposed by James Hunt on 2014-08-14
Status: Rejected
Rejected by: James Hunt on 2014-09-04
Proposed branch: lp:~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode
Merge into: lp:upstart
Diff against target: 95 lines (+6/-23)
2 files modified
ChangeLog (+6/-0)
init/cgroup.c (+0/-23)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode
Reviewer Review Type Date Requested Status
James Hunt Disapprove on 2014-09-04
Review via email: mp+230762@code.launchpad.net

Description of the change

* init/cgroup.c: Remove nih_debug() and nih_warn() calls since, although
  useful, this output pollutes job logs when running in debug mode.

To post a comment you must log in.
James Hunt (jamesodhunt) wrote :

No longer required as lp:~jamesodhunt/upstart/bug-1357252 contained these changes.

review: Disapprove

Unmerged revisions

1660. By James Hunt on 2014-08-14

* init/cgroup.c: Remove nih_debug() and nih_warn() calls since, although
  useful, this output pollutes job logs when running in debug mode.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2014-07-16 16:38:24 +0000
3+++ ChangeLog 2014-08-14 09:32:59 +0000
4@@ -1,3 +1,9 @@
5+2014-08-14 James Hunt <james.hunt@ubuntu.com>
6+
7+ * init/cgroup.c: Remove nih_debug() and nih_warn() calls since,
8+ although useful, this output pollutes job logs when running in
9+ debug mode.
10+
11 2014-07-16 James Hunt <james.hunt@ubuntu.com>
12
13 * NEWS: Release 1.13.1
14
15=== modified file 'init/cgroup.c'
16--- init/cgroup.c 2014-07-01 13:17:52 +0000
17+++ init/cgroup.c 2014-08-14 09:32:59 +0000
18@@ -1004,8 +1004,6 @@
19 /* Drop initial reference now the proxy holds one */
20 dbus_connection_unref (connection);
21
22- nih_debug ("Connected to cgroup manager");
23-
24 return 0;
25 }
26
27@@ -1021,8 +1019,6 @@
28 nih_assert (connection);
29 nih_assert (cgroup_manager_address);
30
31- nih_warn (_("Disconnected from cgroup manager"));
32-
33 cgroup_manager = NULL;
34 nih_free (cgroup_manager_address);
35 cgroup_manager_address = NULL;
36@@ -1078,9 +1074,6 @@
37
38 if (ret < 0)
39 return FALSE;
40-
41- nih_debug ("Moved pid %d to root of '%s' controller cgroup",
42- pid, controller);
43 }
44
45 /* Ask cgmanager to create the cgroup */
46@@ -1093,10 +1086,6 @@
47 if (ret < 0)
48 return FALSE;
49
50- nih_debug ("%s '%s' controller cgroup '%s'",
51- ! existed ? "Created" : "Using existing",
52- controller, path);
53-
54 /* Get the cgroup manager to delete the cgroup once no more job
55 * processes remain in it. Never mind if auto-deletion occurs between
56 * a jobs processes since the group will be recreated anyway by
57@@ -1124,9 +1113,6 @@
58 if (ret < 0)
59 return FALSE;
60
61- nih_debug ("Set remove on empty for '%s' controller cgroup '%s'",
62- controller, path);
63-
64 return TRUE;
65 }
66
67@@ -1162,9 +1148,6 @@
68 if (ret < 0)
69 return FALSE;
70
71- nih_debug ("Moved pid %d to '%s' controller cgroup '%s'",
72- pid, controller, path);
73-
74 return TRUE;
75 }
76
77@@ -1371,9 +1354,6 @@
78 return FALSE;
79 }
80
81- nih_debug ("Applied cgroup settings to '%s' controller cgroup '%s'",
82- controller, path);
83-
84 return TRUE;
85 }
86
87@@ -1455,8 +1435,5 @@
88 if (ret < 0)
89 return FALSE;
90
91- nih_debug ("Changed ownership of '%s' controller cgroup '%s'",
92- controller, path);
93-
94 return TRUE;
95 }

Subscribers

People subscribed via source and target branches