5 files changed, 20 insertions, 21 deletions

diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index 16d33010d..1fbbbf0b1 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -471,7 +471,7 @@ monkey_window_handle_redraw(int argc, char **argv)
 		clip.y1 = atoi(argv[6]);
 	}
   
-	LOG("Issue redraw");
+	NSLOG(netsurf, INFO, "Issue redraw");
 	fprintf(stdout, "WINDOW REDRAW WIN %d START\n", atoi(argv[2]));
 	browser_window_redraw(gw->bw, gw->scrollx, gw->scrolly, &clip, &ctx);  
 	fprintf(stdout, "WINDOW REDRAW WIN %d STOP\n", atoi(argv[2]));
diff --git a/frontends/monkey/dispatch.c b/frontends/monkey/dispatch.c
index b531f05f9..e60325cf1 100644
--- a/frontends/monkey/dispatch.c
+++ b/frontends/monkey/dispatch.c
@@ -40,7 +40,7 @@ monkey_register_handler(const char *cmd, handle_command_fn fn)
 {
 	monkey_cmdhandler_t *ret = calloc(sizeof(*ret), 1);
 	if (ret == NULL) {
-		LOG("Unable to allocate handler");
+		NSLOG(netsurf, INFO, "Unable to allocate handler");
 		return NSERROR_NOMEM;
 	}
 	ret->cmd = strdup(cmd);
diff --git a/frontends/monkey/filetype.c b/frontends/monkey/filetype.c
index 20bd1edad..979796baf 100644
--- a/frontends/monkey/filetype.c
+++ b/frontends/monkey/filetype.c
@@ -85,7 +85,8 @@ void monkey_fetch_filetype_init(const char *mimefile)
 	fh = fopen(mimefile, "r");
 
 	if (fh == NULL) {
-		LOG("Unable to open a mime.types file, so using a minimal one for you.");
+		NSLOG(netsurf, INFO,
+		      "Unable to open a mime.types file, so using a minimal one for you.");
 		return;
 	}
 
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 1bea02471..53cde5a72 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -278,20 +278,20 @@ static void monkey_run(void)
 		/* setup timeout */
 		switch (schedtm) {
 		case -1:
-			LOG("Iterate blocking");
+			NSLOG(netsurf, INFO, "Iterate blocking");
 			fprintf(stdout, "GENERIC POLL BLOCKING\n");
 			timeout = NULL;
 			break;
 
 		case 0:
-			LOG("Iterate immediate");
+			NSLOG(netsurf, INFO, "Iterate immediate");
 			tv.tv_sec = 0;
 			tv.tv_usec = 0;
 			timeout = &tv;
 			break;
 
 		default:
-			LOG("Iterate non-blocking");
+			NSLOG(netsurf, INFO, "Iterate non-blocking");
 			fprintf(stdout, "GENERIC POLL TIMED %d\n", schedtm);
 			tv.tv_sec = schedtm / 1000; /* miliseconds to seconds */
 			tv.tv_usec = (schedtm % 1000) * 1000; /* remainder to microseconds */
@@ -361,7 +361,7 @@ main(int argc, char **argv)
 	messages = filepath_find(respaths, "Messages");
 	ret = messages_add_from_file(messages);
 	if (ret != NSERROR_OK) {
-		LOG("Messages failed to load");
+		NSLOG(netsurf, INFO, "Messages failed to load");
 	}
 
 	/* common initialisation */
@@ -404,5 +404,8 @@ main(int argc, char **argv)
 	/* finalise options */
 	nsoption_finalise(nsoptions, nsoptions_default);
 
+	/* finalise logging */
+	nslog_finalise();
+
 	return 0;
 }
diff --git a/frontends/monkey/schedule.c b/frontends/monkey/schedule.c
index af1144a0e..3d76997f4 100644
--- a/frontends/monkey/schedule.c
+++ b/frontends/monkey/schedule.c
@@ -24,12 +24,6 @@
 
 #include "monkey/schedule.h"
 
-#ifdef DEBUG_SCHEDULER
-#define SRLOG(x...) LOG(x)
-#else
-#define SRLOG(x...) ((void) 0)
-#endif
-
 /* linked list of scheduled callbacks */
 static struct nscallback *schedule_list = NULL;
 
@@ -63,7 +57,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
 		return NSERROR_OK;
 	}
 
-	SRLOG("removing %p, %p", callback, p);
+	NSLOG(schedule, DEBUG, "removing %p, %p", callback, p);
 
 	cur_nscb = schedule_list;
 	prev_nscb = NULL;
@@ -73,7 +67,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
 		    (cur_nscb->p ==  p)) {
 			/* item to remove */
 
-			SRLOG("callback entry %p removing  %p(%p)",
+			NSLOG(schedule, DEBUG, "callback entry %p removing  %p(%p)",
 			      cur_nscb, cur_nscb->callback, cur_nscb->p);
 
 			/* remove callback */
@@ -109,7 +103,7 @@ nserror monkey_schedule(int tival, void (*callback)(void *p), void *p)
 		return ret;
 	}
 
-	SRLOG("Adding %p(%p) in %d", callback, p, tival);
+	NSLOG(schedule, DEBUG, "Adding %p(%p) in %d", callback, p, tival);
 
 	tv.tv_sec = tival / 1000; /* miliseconds to seconds */
 	tv.tv_usec = (tival % 1000) * 1000; /* remainder to microseconds */
@@ -190,8 +184,8 @@ int monkey_schedule_run(void)
 	/* make rettime relative to now */
 	timersub(&nexttime, &tv, &rettime);
 
-	SRLOG("returning time to next event as %ldms",
-	      (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000));
+	NSLOG(schedule, DEBUG, "returning time to next event as %ldms",
+	      (long)((rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)));
 
 	/* return next event time in milliseconds (24days max wait) */
 	return (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000);
@@ -204,13 +198,14 @@ void monkey_schedule_list(void)
 
 	gettimeofday(&tv, NULL);
 
-	LOG("schedule list at %lld:%ld", (long long)tv.tv_sec, tv.tv_usec);
+	NSLOG(netsurf, INFO, "schedule list at %lld:%ld",
+	      (long long)tv.tv_sec, tv.tv_usec);
 
 	cur_nscb = schedule_list;
 
 	while (cur_nscb != NULL) {
-		LOG("Schedule %p at %lld:%ld",
-		    cur_nscb, (long long)cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
+		NSLOG(netsurf, INFO, "Schedule %p at %lld:%ld", cur_nscb,
+		      (long long)cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
 		cur_nscb = cur_nscb->next;
 	}
 }