projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a20ef36266364f1fbc17ce4a6ff0100a09f258cd..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 "amanda.h"
#include "conffile.h"
#include "logfile.h"
-#include "version.h"
char *datestamp;
char *datestamp;
@@
-48,7
+47,7
@@
main(
char *logfname;
char *conf_logdir;
FILE *logfile;
char *logfname;
char *conf_logdir;
FILE *logfile;
- config_over
writ
es_t *cfg_ovr = NULL;
+ config_over
rid
es_t *cfg_ovr = NULL;
char *cfg_opt = NULL;
/*
char *cfg_opt = NULL;
/*
@@
-66,10
+65,10
@@
main(
dbopen(DBG_SUBDIR_SERVER);
dbopen(DBG_SUBDIR_SERVER);
-
erroutput_type = ERR_INTERACTIVE
;
+
add_amanda_log_handler(amanda_log_stderr)
;
/* Process options */
/* Process options */
- cfg_ovr = extract_commandline_config_over
writ
es(&argc, &argv);
+ cfg_ovr = extract_commandline_config_over
rid
es(&argc, &argv);
if (argc >= 2) {
cfg_opt = argv[1];
if (argc >= 2) {
cfg_opt = argv[1];
@@
-77,8
+76,8
@@
main(
/* read configuration files */
/* read configuration files */
+ set_config_overrides(cfg_ovr);
config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD, cfg_opt);
config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD, cfg_opt);
- apply_config_overwrites(cfg_ovr);
if (config_errors(NULL) >= CFGERR_WARNINGS) {
config_print_errors();
if (config_errors(NULL) >= CFGERR_WARNINGS) {
config_print_errors();
@@
-103,8
+102,7
@@
main(
}
amfree(logfname);
}
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) {
while(get_logline(logfile)) {
if(curlog == L_START) {