[Feature] Allow to log severity level explicitly

1 files changed, 19 insertions, 6 deletions

diff --git a/src/libserver/logger/logger_console.c b/src/libserver/logger/logger_console.c
index c7857bdfe..3e142fe27 100644
--- a/src/libserver/logger/logger_console.c
+++ b/src/libserver/logger/logger_console.c
@@ -28,6 +28,7 @@ static const gchar lf_chr = '\n';
 struct rspamd_console_logger_priv {
 	gint fd;
 	gint crit_fd;
+	gboolean log_severity;
 	gboolean log_color;
 	gboolean log_rspamadm;
 	gboolean log_tty;
@@ -63,6 +64,7 @@ rspamd_log_console_init (rspamd_logger_t *logger, struct rspamd_config *cfg,
 
 	priv = g_malloc0 (sizeof (*priv));
 	priv->log_color = (logger->flags & RSPAMD_LOG_FLAG_COLOR);
+	priv->log_severity = (logger->flags & RSPAMD_LOG_FLAG_SEVERITY);
 	priv->log_rspamadm = (logger->flags & RSPAMD_LOG_FLAG_RSPAMADM);
 
 	if (priv->log_rspamadm) {
@@ -224,12 +226,23 @@ rspamd_log_console_log (const gchar *module, const gchar *id,
 	}
 	else {
 		if (!(rspamd_log->flags & RSPAMD_LOG_FLAG_SYSTEMD)) {
-			r += rspamd_snprintf (tmpbuf + r,
-					sizeof (tmpbuf) - r,
-					"%s #%P(%s) ",
-					timebuf,
-					rspamd_log->pid,
-					rspamd_log->process_type);
+			if (priv->log_severity) {
+				r += rspamd_snprintf(tmpbuf + r,
+						sizeof(tmpbuf) - r,
+						"%s [%s] #%P(%s) ",
+						timebuf,
+						rspamd_get_log_severity_string (level_flags),
+						rspamd_log->pid,
+						rspamd_log->process_type);
+			}
+			else {
+				r += rspamd_snprintf(tmpbuf + r,
+						sizeof(tmpbuf) - r,
+						"%s #%P(%s) ",
+						timebuf,
+						rspamd_log->pid,
+						rspamd_log->process_type);
+			}
 		} else {
 			r += rspamd_snprintf (tmpbuf + r,
 					sizeof (tmpbuf) - r,