console: move to new logger

Use new logger and remove usage of SYS_LOG.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

drivers/console/Kconfig.telnet

@@ -84,24 +84,9 @@ config TELNET_CONSOLE_PRIO
 	help
 	  This option helps to fine-tune telnet's inner thread priority.
 
-config SYS_LOG_TELNET_CONSOLE_LEVEL
-	int "Telnet console log level"
-	default 0
-	depends on SYS_LOG
-	help
-	  Sets log level for telnet console (for telnet console dev only)
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = TELNET_CONSOLE
+module-str = telnet console
+source "subsys/logging/Kconfig.template.log_config"
 
 config TELNET_CONSOLE_DEBUG_DEEP
 	bool "Forward output to original console handler"

drivers/console/Kconfig.ws

@@ -72,24 +72,9 @@ config WEBSOCKET_CONSOLE_PRIO
 	help
 	This option helps to fine-tune WS console inner thread priority.
 
-config SYS_LOG_WEBSOCKET_CONSOLE_LEVEL
-	int "WS console log level"
-	default 0
-	depends on SYS_LOG
-	help
-	Sets log level for websocket console (for WS console dev only)
-
-	Levels are:
-
-	- 0 OFF, do not write
-
-	- 1 ERROR, only write SYS_LOG_ERR
-
-	- 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	- 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	- 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = WEBSOCKET_CONSOLE
+module-str = web socket console
+source "subsys/logging/Kconfig.template.log_config"
 
 config WEBSOCKET_CONSOLE_DEBUG_DEEP
 	bool "Forward output to original console handler"

drivers/console/telnet_console.c

@@ -16,9 +16,10 @@
  * RFC 854 - https://tools.ietf.org/html/rfc854
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_TELNET_CONSOLE_LEVEL
-#define SYS_LOG_DOMAIN "net/telnet"
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_TELNET_CONSOLE_LOG_LEVEL
+#define LOG_DOMAIN net_telnet
+#include <logging/log.h>
+LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include <zephyr.h>
 #include <init.h>
@@ -226,7 +227,7 @@ static void telnet_sent_cb(struct net_context *client,
 {
 	if (status) {
 		telnet_end_client_connection();
-		SYS_LOG_ERR("Could not sent last packet");
+		LOG_ERR("Could not sent last packet");
 	}
 }
 
@@ -313,7 +314,7 @@ static inline void telnet_reply_command(void)
 		telnet_reply_do_command();
 		break;
 	default:
-		SYS_LOG_DBG("Operation %u not handled",
+		LOG_DBG("Operation %u not handled",
 			    telnet_cmd.op);
 		break;
 	}
@@ -340,7 +341,7 @@ static inline bool telnet_handle_command(struct net_pkt *pkt)
 #ifdef CONFIG_TELNET_CONSOLE_SUPPORT_COMMAND
 	cmd = (struct telnet_simple_command *)l_start;
 
-	SYS_LOG_DBG("Got a command %u/%u/%u", cmd->iac, cmd->op, cmd->opt);
+	LOG_DBG("Got a command %u/%u/%u", cmd->iac, cmd->op, cmd->opt);
 
 	if (!k_sem_take(&cmd_lock, K_NO_WAIT)) {
 		telnet_command_cpy(&telnet_cmd, cmd);
@@ -401,7 +402,7 @@ static void telnet_recv(struct net_context *client,
 	if (!pkt || status) {
 		telnet_end_client_connection();
 
-		SYS_LOG_DBG("Telnet client dropped (AF_INET%s) status %d",
+		LOG_DBG("Telnet client dropped (AF_INET%s) status %d",
 			    net_context_get_family(client) == AF_INET ?
 			    "" : "6", status);
 		return;
@@ -433,17 +434,17 @@ static void telnet_accept(struct net_context *client,
 			  void *user_data)
 {
 	if (error) {
-		SYS_LOG_ERR("Error %d", error);
+		LOG_ERR("Error %d", error);
 		goto error;
 	}
 
 	if (client_cnx) {
-		SYS_LOG_WRN("A telnet client is already in.");
+		LOG_WRN("A telnet client is already in.");
 		goto error;
 	}
 
 	if (net_context_recv(client, telnet_recv, 0, NULL)) {
-		SYS_LOG_ERR("Unable to setup reception (family %u)",
+		LOG_ERR("Unable to setup reception (family %u)",
 			    net_context_get_family(client));
 		goto error;
 	}
@@ -452,7 +453,7 @@ static void telnet_accept(struct net_context *client,
 		goto error;
 	}
 
-	SYS_LOG_DBG("Telnet client connected (family AF_INET%s)",
+	LOG_DBG("Telnet client connected (family AF_INET%s)",
 		    net_context_get_family(client) == AF_INET ? "" : "6");
 
 	orig_printk_hook = __printk_get_hook();
@@ -470,32 +471,32 @@ static void telnet_setup_server(struct net_context **ctx, sa_family_t family,
 				struct sockaddr *addr, socklen_t addrlen)
 {
 	if (net_context_get(family, SOCK_STREAM, IPPROTO_TCP, ctx)) {
-		SYS_LOG_ERR("No context available");
+		LOG_ERR("No context available");
 		goto error;
 	}
 
 	if (net_context_bind(*ctx, addr, addrlen)) {
-		SYS_LOG_ERR("Cannot bind on family AF_INET%s",
+		LOG_ERR("Cannot bind on family AF_INET%s",
 			    family == AF_INET ? "" : "6");
 		goto error;
 	}
 
 	if (net_context_listen(*ctx, 0)) {
-		SYS_LOG_ERR("Cannot listen on");
+		LOG_ERR("Cannot listen on");
 		goto error;
 	}
 
 	if (net_context_accept(*ctx, telnet_accept, K_NO_WAIT, NULL)) {
-		SYS_LOG_ERR("Cannot accept");
+		LOG_ERR("Cannot accept");
 		goto error;
 	}
 
-	SYS_LOG_DBG("Telnet console enabled on AF_INET%s",
+	LOG_DBG("Telnet console enabled on AF_INET%s",
 		    family == AF_INET ? "" : "6");
 
 	return;
 error:
-	SYS_LOG_ERR("Unable to start telnet on AF_INET%s",
+	LOG_ERR("Unable to start telnet on AF_INET%s",
 		    family == AF_INET ? "" : "6");
 
 	if (*ctx) {
@@ -549,7 +550,7 @@ static int telnet_console_init(struct device *arg)
 			NULL, NULL, NULL,
 			K_PRIO_COOP(TELNET_PRIORITY), 0, K_MSEC(10));
 
-	SYS_LOG_INF("Telnet console initialized");
+	LOG_INF("Telnet console initialized");
 
 	return 0;
 }

drivers/console/websocket_console.c

@@ -13,9 +13,10 @@
  * a websocket connection.
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_WEBSOCKET_CONSOLE_LEVEL
-#define SYS_LOG_DOMAIN "ws/console"
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_WEBSOCKET_CONSOLE_LOG_LEVEL
+#define LOG_DOMAIN ws_console
+#include <logging/log.h>
+LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include <zephyr.h>
 #include <init.h>
@@ -328,7 +329,7 @@ static int ws_console_init(struct device *arg)
 			NULL, NULL, NULL,
 			K_PRIO_COOP(WS_CONSOLE_PRIORITY), 0, K_MSEC(10));
 
-	SYS_LOG_INF("Websocket console initialized");
+	LOG_INF("Websocket console initialized");
 
 	return 0;
 }