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
=== modified file 'ChangeLog'
--- ChangeLog 2014-07-16 16:38:24 +0000
+++ ChangeLog 2014-08-14 09:32:59 +0000
@@ -1,3 +1,9 @@
12014-08-14 James Hunt <james.hunt@ubuntu.com>
2
3 * init/cgroup.c: Remove nih_debug() and nih_warn() calls since,
4 although useful, this output pollutes job logs when running in
5 debug mode.
6
12014-07-16 James Hunt <james.hunt@ubuntu.com>72014-07-16 James Hunt <james.hunt@ubuntu.com>
28
3 * NEWS: Release 1.13.19 * NEWS: Release 1.13.1
410
=== modified file 'init/cgroup.c'
--- init/cgroup.c 2014-07-01 13:17:52 +0000
+++ init/cgroup.c 2014-08-14 09:32:59 +0000
@@ -1004,8 +1004,6 @@
1004 /* Drop initial reference now the proxy holds one */1004 /* Drop initial reference now the proxy holds one */
1005 dbus_connection_unref (connection);1005 dbus_connection_unref (connection);
10061006
1007 nih_debug ("Connected to cgroup manager");
1008
1009 return 0;1007 return 0;
1010}1008}
10111009
@@ -1021,8 +1019,6 @@
1021 nih_assert (connection);1019 nih_assert (connection);
1022 nih_assert (cgroup_manager_address);1020 nih_assert (cgroup_manager_address);
10231021
1024 nih_warn (_("Disconnected from cgroup manager"));
1025
1026 cgroup_manager = NULL;1022 cgroup_manager = NULL;
1027 nih_free (cgroup_manager_address);1023 nih_free (cgroup_manager_address);
1028 cgroup_manager_address = NULL;1024 cgroup_manager_address = NULL;
@@ -1078,9 +1074,6 @@
10781074
1079 if (ret < 0)1075 if (ret < 0)
1080 return FALSE;1076 return FALSE;
1081
1082 nih_debug ("Moved pid %d to root of '%s' controller cgroup",
1083 pid, controller);
1084 }1077 }
10851078
1086 /* Ask cgmanager to create the cgroup */1079 /* Ask cgmanager to create the cgroup */
@@ -1093,10 +1086,6 @@
1093 if (ret < 0)1086 if (ret < 0)
1094 return FALSE;1087 return FALSE;
10951088
1096 nih_debug ("%s '%s' controller cgroup '%s'",
1097 ! existed ? "Created" : "Using existing",
1098 controller, path);
1099
1100 /* Get the cgroup manager to delete the cgroup once no more job1089 /* Get the cgroup manager to delete the cgroup once no more job
1101 * processes remain in it. Never mind if auto-deletion occurs between1090 * processes remain in it. Never mind if auto-deletion occurs between
1102 * a jobs processes since the group will be recreated anyway by1091 * a jobs processes since the group will be recreated anyway by
@@ -1124,9 +1113,6 @@
1124 if (ret < 0)1113 if (ret < 0)
1125 return FALSE;1114 return FALSE;
11261115
1127 nih_debug ("Set remove on empty for '%s' controller cgroup '%s'",
1128 controller, path);
1129
1130 return TRUE;1116 return TRUE;
1131}1117}
11321118
@@ -1162,9 +1148,6 @@
1162 if (ret < 0)1148 if (ret < 0)
1163 return FALSE;1149 return FALSE;
11641150
1165 nih_debug ("Moved pid %d to '%s' controller cgroup '%s'",
1166 pid, controller, path);
1167
1168 return TRUE;1151 return TRUE;
1169}1152}
11701153
@@ -1371,9 +1354,6 @@
1371 return FALSE;1354 return FALSE;
1372 }1355 }
13731356
1374 nih_debug ("Applied cgroup settings to '%s' controller cgroup '%s'",
1375 controller, path);
1376
1377 return TRUE;1357 return TRUE;
1378}1358}
13791359
@@ -1455,8 +1435,5 @@
1455 if (ret < 0)1435 if (ret < 0)
1456 return FALSE;1436 return FALSE;
14571437
1458 nih_debug ("Changed ownership of '%s' controller cgroup '%s'",
1459 controller, path);
1460
1461 return TRUE;1438 return TRUE;
1462}1439}

Subscribers

People subscribed via source and target branches