Renamed error recording / logging functions.

[sysdb.git] / src / daemon / config.c

diff --git a/src/daemon/config.c b/src/daemon/config.c
index 0b7cc77bfd9a7a6a6bc8e1acd1f5f93f353389f4..2975e06fa7d218393907bbcd770809d6689353ff 100644 (file)
--- a/src/daemon/config.c
+++ b/src/daemon/config.c
@@ -1,5 +1,5 @@
 /*
- * syscollector - src/daemon_config.c
+ * SysDB - src/daemon/config.c
  * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
@@ -25,8 +25,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "syscollector.h"
+#include "sysdb.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/time.h"
 
 #include "daemon/config.h"
@@ -41,34 +42,34 @@
  * private variables
  */
 
-static sc_time_t default_interval = 0;
+static sdb_time_t default_interval = 0;
 
 /*
  * private helper functions
  */
 
 static int
-config_get_interval(oconfig_item_t *ci, sc_time_t *interval)
+config_get_interval(oconfig_item_t *ci, sdb_time_t *interval)
 {
        double interval_dbl = 0.0;
 
        assert(ci && interval);
 
        if (oconfig_get_number(ci, &interval_dbl)) {
-               fprintf(stderr, "config: Interval requires "
+               sdb_log(SDB_LOG_ERR, "config: Interval requires "
                                "a single numeric argument\n"
                                "\tUsage: Interval SECONDS\n");
                return -1;
        }
 
        if (interval_dbl <= 0.0) {
-               fprintf(stderr, "config: Invalid interval: %f\n"
+               sdb_log(SDB_LOG_ERR, "config: Invalid interval: %f\n"
                                "\tInterval may not be less than or equal to zero.\n",
                                interval_dbl);
                return -1;
        }
 
-       *interval = DOUBLE_TO_SC_TIME(interval_dbl);
+       *interval = DOUBLE_TO_SDB_TIME(interval_dbl);
        return 0;
 } /* config_get_interval */
 
@@ -93,15 +94,15 @@ daemon_load_backend(oconfig_item_t *ci)
        char  plugin_name[1024];
        char *name;
 
-       sc_plugin_ctx_t ctx = SC_PLUGIN_CTX_INIT;
-       sc_plugin_ctx_t old_ctx;
+       sdb_plugin_ctx_t ctx = SDB_PLUGIN_CTX_INIT;
+       sdb_plugin_ctx_t old_ctx;
 
        int status, i;
 
        ctx.interval = default_interval;
 
        if (oconfig_get_string(ci, &name)) {
-               fprintf(stderr, "config: LoadBackend requires a single "
+               sdb_log(SDB_LOG_ERR, "config: LoadBackend requires a single "
                                "string argument\n"
                                "\tUsage: LoadBackend BACKEND\n");
                return -1;
@@ -117,15 +118,16 @@ daemon_load_backend(oconfig_item_t *ci)
                                return -1;
                }
                else {
-                       fprintf(stderr, "config: Unknown option '%s' inside 'LoadBackend' "
-                                       "-- see the documentation for details.\n", child->key);
-                       return -1;
+                       sdb_log(SDB_LOG_WARNING, "config: Unknown option '%s' "
+                                       "inside 'LoadBackend' -- see the documentation for "
+                                       "details.\n", child->key);
+                       continue;
                }
        }
 
-       old_ctx = sc_plugin_set_ctx(ctx);
-       status = sc_plugin_load(plugin_name);
-       sc_plugin_set_ctx(old_ctx);
+       old_ctx = sdb_plugin_set_ctx(ctx);
+       status = sdb_plugin_load(plugin_name);
+       sdb_plugin_set_ctx(old_ctx);
        return status;
 } /* daemon_load_backend */
 
@@ -137,14 +139,14 @@ daemon_configure_plugin(oconfig_item_t *ci)
        assert(ci);
 
        if (oconfig_get_string(ci, &name)) {
-               fprintf(stderr, "config: %s requires a single "
+               sdb_log(SDB_LOG_ERR, "config: %s requires a single "
                                "string argument\n"
                                "\tUsage: LoadBackend BACKEND\n",
                                ci->key);
                return -1;
        }
 
-       return sc_plugin_configure(name, ci);
+       return sdb_plugin_configure(name, ci);
 } /* daemon_configure_backend */
 
 static token_parser_t token_parser_list[] = {
@@ -179,12 +181,13 @@ daemon_parse_config(const char *filename)
                }
 
                if (status) {
-                       fprintf(stderr, "config: Failed to parse option '%s'\n",
+                       sdb_error_set("config: Failed to parse option '%s'\n",
                                        child->key);
                        if (status > 0)
-                               fprintf(stderr, "\tUnknown option '%s' -- "
+                               sdb_error_append("\tUnknown option '%s' -- "
                                                "see the documentation for details\n",
                                                child->key);
+                       sdb_error_log(SDB_LOG_ERR);
                        retval = -1;
                }
        }