logging: Clean up debug logs

We have quite a few pb_logs which should be pb_debug. This change moves
developer-specific info to pb_debug.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

7 files changed, 16 insertions, 25 deletions

diff --git a/discover/device-handler.c b/discover/device-handler.c
index af9fbba..43bcd9f 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -440,7 +440,7 @@ static bool resource_resolve(struct resource *res, const char *name,
 	if (resource_is_resolved(res))
 		return true;
 
-	pb_log("Attempting to resolve resource %s->%s with parser %s\n",
+	pb_debug("Attempting to resolve resource %s->%s with parser %s\n",
 			opt->option->id, name, parser->name);
 	parser->resolve_resource(handler, res);
 
@@ -502,13 +502,13 @@ static void process_boot_option_queue(struct device_handler *handler)
 	list_for_each_entry_safe(&handler->unresolved_boot_options,
 			opt, tmp, list) {
 
-		pb_log("queue: attempting resolution for %s\n",
+		pb_debug("queue: attempting resolution for %s\n",
 				opt->option->id);
 
 		if (!boot_option_resolve(opt, handler))
 			continue;
 
-		pb_log("\tresolved!\n");
+		pb_debug("\tresolved!\n");
 
 		list_remove(&opt->list);
 		list_add_tail(&opt->device->boot_options, &opt->list);
diff --git a/discover/discover-server.c b/discover/discover-server.c
index 2467e33..41a4fde 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -74,12 +74,12 @@ static void print_clients(struct discover_server *server)
 {
 	struct client *client;
 
-	pb_log("current clients [%p,%p,%p]:\n",
+	pb_debug("current clients [%p,%p,%p]:\n",
 			&server->clients.head,
 			server->clients.head.prev,
 			server->clients.head.next);
 	list_for_each_entry(&server->clients, client, list)
-		pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
+		pb_debug("\t[%p,%p,%p] client: %d\n", &client->list,
 				client->list.prev, client->list.next,
 				client->fd);
 }
diff --git a/discover/network.c b/discover/network.c
index d39f7a7..b9b0c50 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -204,7 +204,7 @@ static int interface_down(struct interface *interface)
 static void udhcpc_process_exit(struct process *process)
 {
 	struct interface *interface = process->data;
-	pb_log("udhcp client [pid %d] for interface %s exited, rc %d\n",
+	pb_debug("udhcp client [pid %d] for interface %s exited, rc %d\n",
 			process->pid, interface->name, process->exit_status);
 	interface->udhcpc_process = NULL;
 	process_release(process);
diff --git a/discover/parser-conf.c b/discover/parser-conf.c
index 3154a46..79193ed 100644
--- a/discover/parser-conf.c
+++ b/discover/parser-conf.c
@@ -181,7 +181,7 @@ int conf_set_global_option(struct conf_context *conf, const char *name,
 		if (streq(name, conf->global_options[i].name)) {
 			conf->global_options[i].value
 				= talloc_strdup(conf, value);
-			pb_log("%s: %s = '%s'\n", __func__, name, value);
+			pb_debug("%s: %s = '%s'\n", __func__, name, value);
 			return 1;
 		}
 	}
diff --git a/discover/parser.c b/discover/parser.c
index e83b994..7b70118 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -140,7 +140,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 			if (i->parser->method != CONF_METHOD_LOCAL_FILE)
 				continue;
 
-			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			pb_debug("\ttrying parser '%s'\n", i->parser->name);
 			ctx->parser = i->parser;
 			iterate_parser_files(ctx, ctx->parser);
 		}
@@ -158,7 +158,7 @@ void iterate_parsers(struct discover_context *ctx, enum conf_method method)
 			if (i->parser->method != method)
 				continue;
 
-			pb_log("\ttrying parser '%s'\n", i->parser->name);
+			pb_debug("\ttrying parser '%s'\n", i->parser->name);
 			ctx->parser = i->parser;
 			i->parser->parse(ctx, buf, len);
 		}
diff --git a/discover/udev.c b/discover/udev.c
index 6212e43..0c656f3 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -23,15 +23,6 @@
 #include "pb-discover.h"
 #include "device-handler.h"
 
-#if defined(DEBUG)
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
-#define DBGS(fmt, args...) \
-	pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
-#else
-#define DBG(fmt, args...)
-#define DBGS(fmt, args...)
-#endif
-
 struct pb_udev {
 	struct udev *udev;
 	struct udev_monitor *monitor;
@@ -323,7 +314,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
 	waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
 		udev_process, udev->monitor);
 
-	pb_log("%s: waiting on udev\n", __func__);
+	pb_debug("%s: waiting on udev\n", __func__);
 
 	return udev;
 
diff --git a/discover/user-event.c b/discover/user-event.c
index 275d9e2..4b56de4 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -65,11 +65,11 @@ static void user_event_print_event(struct event __attribute__((unused)) *event)
 {
 	int i;
 
-	pb_log("user_event %s event:\n", event_action_name(event->action));
-	pb_log("\tdevice: %s\n", event->device);
+	pb_debug("user_event %s event:\n", event_action_name(event->action));
+	pb_debug("\tdevice: %s\n", event->device);
 
 	for (i = 0; i < event->n_params; i++)
-		pb_log("\t%-12s => %s\n",
+		pb_debug("\t%-12s => %s\n",
 			event->params[i].name, event->params[i].value);
 }
 
@@ -276,7 +276,7 @@ static int user_event_process(void *arg)
 		return 0;
 	}
 
-	pb_log("%s: %u bytes\n", __func__, len);
+	pb_debug("%s: %u bytes\n", __func__, len);
 
 	user_event_handle_message(uev, buf, len);
 
@@ -287,7 +287,7 @@ static int user_event_destructor(void *arg)
 {
 	struct user_event *uev = arg;
 
-	pb_log("%s\n", __func__);
+	pb_debug("%s\n", __func__);
 
 	if (uev->socket >= 0)
 		close(uev->socket);
@@ -328,7 +328,7 @@ struct user_event *user_event_init(struct waitset *waitset,
 	waiter_register_io(waitset, uev->socket, WAIT_IN,
 			user_event_process, uev);
 
-	pb_log("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);
+	pb_debug("%s: waiting on %s\n", __func__, PBOOT_USER_EVENT_SOCKET);
 
 	return uev;