Renamed error recording / logging functions.

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

diff --git a/src/daemon/config.c b/src/daemon/config.c
index ea870c2d21c636110a54d553fedf73fc82888165..2975e06fa7d218393907bbcd770809d6689353ff 100644 (file)
--- a/src/daemon/config.c
+++ b/src/daemon/config.c
@@ -56,14 +56,14 @@ config_get_interval(oconfig_item_t *ci, sdb_time_t *interval)
        assert(ci && interval);
 
        if (oconfig_get_number(ci, &interval_dbl)) {
-               sdb_error_set(SDB_LOG_ERR, "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) {
-               sdb_error_set(SDB_LOG_ERR, "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;
@@ -102,7 +102,7 @@ daemon_load_backend(oconfig_item_t *ci)
        ctx.interval = default_interval;
 
        if (oconfig_get_string(ci, &name)) {
-               sdb_error_set(SDB_LOG_ERR, "config: LoadBackend requires a single "
+               sdb_log(SDB_LOG_ERR, "config: LoadBackend requires a single "
                                "string argument\n"
                                "\tUsage: LoadBackend BACKEND\n");
                return -1;
@@ -118,7 +118,7 @@ daemon_load_backend(oconfig_item_t *ci)
                                return -1;
                }
                else {
-                       sdb_error_set(SDB_LOG_WARNING, "config: Unknown option '%s' "
+                       sdb_log(SDB_LOG_WARNING, "config: Unknown option '%s' "
                                        "inside 'LoadBackend' -- see the documentation for "
                                        "details.\n", child->key);
                        continue;
@@ -139,7 +139,7 @@ daemon_configure_plugin(oconfig_item_t *ci)
        assert(ci);
 
        if (oconfig_get_string(ci, &name)) {
-               sdb_error_set(SDB_LOG_ERR, "config: %s requires a single "
+               sdb_log(SDB_LOG_ERR, "config: %s requires a single "
                                "string argument\n"
                                "\tUsage: LoadBackend BACKEND\n",
                                ci->key);
@@ -181,13 +181,13 @@ daemon_parse_config(const char *filename)
                }
 
                if (status) {
-                       sdb_error_start(SDB_LOG_ERR, "config: Failed to parse option "
-                                       "'%s'\n", child->key);
+                       sdb_error_set("config: Failed to parse option '%s'\n",
+                                       child->key);
                        if (status > 0)
                                sdb_error_append("\tUnknown option '%s' -- "
                                                "see the documentation for details\n",
                                                child->key);
-                       sdb_error_finish();
+                       sdb_error_log(SDB_LOG_ERR);
                        retval = -1;
                }
        }