James Hunt has proposed merging 
lp:~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode/+merge/230762

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

-- 
https://code.launchpad.net/~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode/+merge/230762
Your team Upstart Reviewers is requested to review the proposed merge of 
lp:~jamesodhunt/upstart/make-cgroups-quiet-in-debug-mode into lp:upstart.
=== modified file 'ChangeLog'
--- ChangeLog	2014-07-16 16:38:24 +0000
+++ ChangeLog	2014-08-14 09:32:59 +0000
@@ -1,3 +1,9 @@
+2014-08-14  James Hunt  <[email protected]>
+
+	* init/cgroup.c: Remove nih_debug() and nih_warn() calls since,
+	  although useful, this output pollutes job logs when running in
+	  debug mode.
+
 2014-07-16  James Hunt  <[email protected]>
 
 	* NEWS: Release 1.13.1

=== 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 @@
 	/* Drop initial reference now the proxy holds one */
 	dbus_connection_unref (connection);
 
-	nih_debug ("Connected to cgroup manager");
-
 	return 0;
 }
 
@@ -1021,8 +1019,6 @@
 	nih_assert (connection);
 	nih_assert (cgroup_manager_address);
 
-	nih_warn (_("Disconnected from cgroup manager"));
-
 	cgroup_manager = NULL;
 	nih_free (cgroup_manager_address);
 	cgroup_manager_address = NULL;
@@ -1078,9 +1074,6 @@
 
 		if (ret < 0)
 			return FALSE;
-
-		nih_debug ("Moved pid %d to root of '%s' controller cgroup",
-			   pid, controller);
 	}
 
 	/* Ask cgmanager to create the cgroup */
@@ -1093,10 +1086,6 @@
 	if (ret < 0)
 		return FALSE;
 
-	nih_debug ("%s '%s' controller cgroup '%s'",
-			! existed ? "Created" : "Using existing",
-			controller, path);
-
 	/* Get the cgroup manager to delete the cgroup once no more job
 	 * processes remain in it. Never mind if auto-deletion occurs between
 	 * a jobs processes since the group will be recreated anyway by
@@ -1124,9 +1113,6 @@
 	if (ret < 0)
 		return FALSE;
 
-	nih_debug ("Set remove on empty for '%s' controller cgroup '%s'",
-			controller, path);
-
 	return TRUE;
 }
 
@@ -1162,9 +1148,6 @@
 	if (ret < 0)
 		return FALSE;
 
-	nih_debug ("Moved pid %d to '%s' controller cgroup '%s'",
-			pid, controller, path);
-
 	return TRUE;
 }
 
@@ -1371,9 +1354,6 @@
 			return FALSE;
 	}
 
-	nih_debug ("Applied cgroup settings to '%s' controller cgroup '%s'",
-			controller, path);
-
 	return TRUE;
 }
 
@@ -1455,8 +1435,5 @@
 	if (ret < 0)
 		return FALSE;
 
-	nih_debug ("Changed ownership of '%s' controller cgroup '%s'",
-			controller, path);
-
 	return TRUE;
 }

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to