Make configuration validation function return validation error message

Scribery · Mar 21, 2018 · 25d32fc · 25d32fc
1 parent 982f906
commit 25d32fc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/lib/tlog/play_conf.c b/lib/tlog/play_conf.c
@@ -136,6 +136,11 @@ tlog_play_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_play_conf_validate(NULL,
+                                   conf,
+                                   TLOG_CONF_ORIGIN_ARGS) == TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;

diff --git a/lib/tlog/rec_conf.c b/lib/tlog/rec_conf.c
@@ -250,6 +250,11 @@ tlog_rec_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_rec_conf_validate(NULL,
+                                  conf,
+                                  TLOG_CONF_ORIGIN_ARGS) == TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;

diff --git a/lib/tlog/rec_session_conf.c b/lib/tlog/rec_session_conf.c
@@ -265,6 +265,12 @@ tlog_rec_session_conf_load(struct tlog_errs **perrs,
     json_object_put(overlay);
     overlay = NULL;
 
+    /* Check validate the config */
+    assert(tlog_rec_session_conf_validate(NULL,
+                                          conf,
+                                          TLOG_CONF_ORIGIN_ARGS) ==
+                                          TLOG_RC_OK);
+
     grc = TLOG_RC_OK;
     *pcmd_help = cmd_help;
     cmd_help = NULL;