Imported Upstream version 3.1.0

[debian/amanda] / server-src / amlogroll.c

diff --git a/server-src/amlogroll.c b/server-src/amlogroll.c
index 7875815975622c4bf9539c0076ce9fd259baf4f2..dd38d2195dd9fc25baca3caa7e8dda5f92404eb2 100644 (file)
--- a/server-src/amlogroll.c
+++ b/server-src/amlogroll.c
@@ -33,7 +33,6 @@
 #include "amanda.h"
 #include "conffile.h"
 #include "logfile.h"
-#include "version.h"
 
 char *datestamp;
 
@@ -48,7 +47,7 @@ main(
     char *logfname;
     char *conf_logdir;
     FILE *logfile;
-    config_overwrites_t *cfg_ovr = NULL;
+    config_overrides_t *cfg_ovr = NULL;
     char *cfg_opt = NULL;
 
     /*
@@ -66,10 +65,10 @@ main(
 
     dbopen(DBG_SUBDIR_SERVER);
 
-    erroutput_type = ERR_INTERACTIVE;
+    add_amanda_log_handler(amanda_log_stderr);
 
     /* Process options */
-    cfg_ovr = extract_commandline_config_overwrites(&argc, &argv);
+    cfg_ovr = extract_commandline_config_overrides(&argc, &argv);
 
     if (argc >= 2) {
        cfg_opt = argv[1];
@@ -77,15 +76,21 @@ main(
 
     /* read configuration files */
 
-    config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD | CONFIG_INIT_FATAL,
-               cfg_opt);
-    apply_config_overwrites(cfg_ovr);
+    set_config_overrides(cfg_ovr);
+    config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD, cfg_opt);
+
+    if (config_errors(NULL) >= CFGERR_WARNINGS) {
+       config_print_errors();
+       if (config_errors(NULL) >= CFGERR_ERRORS) {
+           g_critical(_("errors processing config file"));
+       }
+    }
 
     safe_cd(); /* must happen after config_init */
 
     check_running_as(RUNNING_AS_DUMPUSER);
 
-    dbrename(config_name, DBG_SUBDIR_SERVER);
+    dbrename(get_config_name(), DBG_SUBDIR_SERVER);
 
     conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
     logfname = vstralloc(conf_logdir, "/", "log", NULL);
@@ -97,8 +102,7 @@ main(
     }
     amfree(logfname);
 
-    erroutput_type |= ERR_AMANDALOG;
-    set_logerror(logerror);
+    add_amanda_log_handler(amanda_log_trace_log);
 
     while(get_logline(logfile)) {
        if(curlog == L_START) {