X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Flogging.c;h=85bdc064c80a7fe179f848e789dc62d1806f2d15;hp=7fd3b1f2345e209b347c7a6e5fc380d38d61ec81;hb=dfae76fd82d4bbd8989264dadc2c3c9cde7e5af7;hpb=2088fa3cd72332f5517edeb9267e381fdf35db01

diff --git a/ccan/tdb2/test/logging.c b/ccan/tdb2/test/logging.c
index 7fd3b1f2..85bdc064 100644
--- a/ccan/tdb2/test/logging.c
+++ b/ccan/tdb2/test/logging.c
@@ -6,6 +6,8 @@
 #include "logging.h"
 
 unsigned tap_log_messages;
+const char *log_prefix = "";
+bool suppress_logging;
 
 union tdb_attribute tap_log_attr = {
 	.log = { .base = { .attr = TDB_ATTRIBUTE_LOG },
@@ -19,10 +21,16 @@ void tap_log_fn(struct tdb_context *tdb,
 	va_list ap;
 	char *p;
 
+	if (suppress_logging)
+		return;
+
 	va_start(ap, fmt);
 	if (vasprintf(&p, fmt, ap) == -1)
 		abort();
-	diag("tdb log level %u: %s", level, p);
+	/* Strip trailing \n: diag adds it. */
+	if (p[strlen(p)-1] == '\n')
+		p[strlen(p)-1] = '\0';
+	diag("tdb log level %u: %s%s", level, log_prefix, p);
 	free(p);
 	if (level != TDB_DEBUG_TRACE)
 		tap_log_messages++;