X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=629d50ae890bff1d9f73298d250c6d423a1fd524;hb=89fa493a3bc34d22eeca06fa4e78523ac3b766a8;hp=1f29acdb5b3a1e825adfce053901db9d1fda38cf;hpb=a93b404161dc42f8dee805c8f95bc4974aded9cb;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 1f29acdb5b..629d50ae89 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -182,6 +182,9 @@ struct command_context *global_cmd_ctx;
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
 struct command_context *setup_command_handler(void)
 {
+	log_init();
+	LOG_DEBUG("log_init: complete");
+
 	struct command_context *cmd_ctx;
 
 	global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
@@ -202,11 +205,7 @@ struct command_context *setup_command_handler(void)
 	pld_register_commands(cmd_ctx);
 	mflash_register_commands(cmd_ctx);
 
-	if (log_init(cmd_ctx) != ERROR_OK)
-	{
-		exit(-1);
-	}
-	LOG_DEBUG("log init complete");
+	LOG_DEBUG("command registration: complete");
 
 	LOG_OUTPUT(OPENOCD_VERSION "\n");