log: output error to syslog when load config file.

This commit is contained in:
Nick Peng
2023-11-19 20:52:18 +08:00
parent fc82c56947
commit fa349b1864
4 changed files with 74 additions and 22 deletions

View File

@@ -683,8 +683,6 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
default:
tlog(TLOG_WARN, "unknown server option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown server option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break;
}
}
@@ -2225,8 +2223,6 @@ static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
default:
tlog(TLOG_WARN, "unknown bind option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown bind option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break;
}
}
@@ -3275,8 +3271,6 @@ static int _conf_ip_rules(void *data, int argc, char *argv[])
default:
tlog(TLOG_WARN, "unknown ip-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown ip-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break;
}
}
@@ -3683,8 +3677,6 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
default:
tlog(TLOG_WARN, "unknown domain-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
syslog(LOG_WARNING, "unknown domain-rules option: %s at '%s:%d'.", argv[optind - 1], conf_get_conf_file(),
conf_get_current_lineno());
break;
}
}
@@ -4226,12 +4218,10 @@ static int _conf_printf(const char *file, int lineno, int ret)
case CONF_RET_WARN:
case CONF_RET_BADCONF:
tlog(TLOG_WARN, "process config failed at '%s:%d'.", file, lineno);
syslog(LOG_WARNING, "process config failed at '%s:%d'.", file, lineno);
return -1;
break;
case CONF_RET_NOENT:
tlog(TLOG_WARN, "unsupported config at '%s:%d'.", file, lineno);
syslog(LOG_WARNING, "unsupported config at '%s:%d'.", file, lineno);
return -1;
break;
default:
@@ -4270,7 +4260,6 @@ int config_additional_file(void *data, int argc, char *argv[])
if (access(file_path, R_OK) != 0) {
tlog(TLOG_WARN, "config file '%s' is not readable, %s", conf_file, strerror(errno));
syslog(LOG_WARNING, "config file '%s' is not readable, %s", conf_file, strerror(errno));
return -1;
}