ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed LogDir configuration directive - it's a command line parameter, 

we need to log even if config file reading fails.


git-svn-id: http://repo.ham.fi/svn/aprsc/trunk@790 3ce903b1-3385-4e86-93cd-f9a4a239f7ac
This commit is contained in:
Heikki Hannikainen 2012-09-01 11:03:08 +00:00
parent a21f2348ff
commit 5c0ab36f5b
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config.c
View File

@ -36,7 +36,6 @@ char *cfgfile = def_cfgfile;
char *pidfile;
char *new_rundir;
char *rundir;
char *new_logdir;
char *logdir; /* access logs go here */
//char *new_webdir;
char *webdir = def_webdir;
@ -133,7 +132,6 @@ int do_logrotate(int *dest, int argc, char **argv);
static struct cfgcmd cfg_cmds[] = {
{ "rundir", _CFUNC_ do_string, &new_rundir },
{ "logdir", _CFUNC_ do_string, &new_logdir },
{ "logrotate", _CFUNC_ do_logrotate, &log_rotate_size },
{ "serverid", _CFUNC_ do_string, &new_serverid },
{ "passcode", _CFUNC_ do_string, &new_passcode },
@ -1058,13 +1056,8 @@ int read_config(void)
}
}
if (!logdir) {
if (new_logdir) {
logdir = new_logdir;
new_logdir = NULL;
} else {
hlog(LOG_CRIT, "Config: logdir not defined.");
failed = 1;
}
hlog(LOG_CRIT, "Config: logdir not defined.");
failed = 1;
}
/* serverid is only applied when running for the first time. */

3
tests/cfg-aprsc/aggregator
View File

@ -14,9 +14,6 @@ MyAdmin "Admin, N0CALL"
# Data directory (for database files)
RunDir data
# Log directory
LogDir logs
### Intervals #########
# Interval specification format examples:
# 600 (600 seconds), 5m, 2h, 1h30m, 1d3h15m24s, etc...

3
tests/cfg-aprsc/basic
View File

@ -14,9 +14,6 @@ MyAdmin "Admin, N0CALL"
# Data directory (for database files)
RunDir data
# Log directory
LogDir logs
### Intervals #########
# Interval specification format examples:
# 600 (600 seconds), 5m, 2h, 1h30m, 1d3h15m24s, etc...

3
tests/cfg-aprsc/uplinks
View File

@ -14,9 +14,6 @@ MyAdmin "Admin, N0CALL"
# Data directory (for database files)
RunDir data
# Log directory
LogDir logs
### Intervals #########
# Interval specification format examples:
# 600 (600 seconds), 5m, 2h, 1h30m, 1d3h15m24s, etc...