From 62d656ace95ea5002c6c5c8e2eddb2901d38ab6f Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 9 Mar 2022 16:10:54 +0100
Subject: [PATCH] vlib: init logging eearlier

Type: improvement
Change-Id: I2eb5543aa470094d4c5ad420a2fcc9873b7808e1
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/vlib/log.c  | 7 ++-----
 src/vlib/log.h  | 1 +
 src/vlib/main.c | 6 ++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/vlib/log.c b/src/vlib/log.c
index 07561d98cf8..a7791e4fee5 100644
--- a/src/vlib/log.c
+++ b/src/vlib/log.c
@@ -366,8 +366,8 @@ format_vlib_log_level (u8 * s, va_list * args)
   return format (s, "%s", t);
 }
 
-static clib_error_t *
-vlib_log_init (vlib_main_t * vm)
+clib_error_t *
+vlib_log_init (vlib_main_t *vm)
 {
   vlib_log_main_t *lm = &log_main;
   vlib_log_class_registration_t *r = lm->registrations;
@@ -396,9 +396,6 @@ vlib_log_init (vlib_main_t * vm)
   return 0;
 }
 
-VLIB_INIT_FUNCTION (vlib_log_init);
-
-
 static clib_error_t *
 show_log (vlib_main_t * vm,
 	  unformat_input_t * input, vlib_cli_command_t * cmd)
diff --git a/src/vlib/log.h b/src/vlib/log.h
index c3ebb8150ee..0ded4a8ec84 100644
--- a/src/vlib/log.h
+++ b/src/vlib/log.h
@@ -117,6 +117,7 @@ typedef struct
 
 extern vlib_log_main_t log_main;
 
+clib_error_t *vlib_log_init (struct vlib_main_t *vm);
 vlib_log_class_t vlib_log_register_class (char *vlass, char *subclass);
 vlib_log_class_t
 vlib_log_register_class_rate_limit (char *class, char *subclass,
diff --git a/src/vlib/main.c b/src/vlib/main.c
index 6d241bd18bb..874f6a1350b 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -1887,6 +1887,12 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input)
       goto done;
     }
 
+  if ((error = vlib_log_init (vm)))
+    {
+      clib_error_report (error);
+      goto done;
+    }
+
   if ((error = vlib_stats_init (vm)))
     {
       clib_error_report (error);
-- 
2.16.6