X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=ec9a0e14dc65eb8debf599ae09ab6fa115b52c05;hp=bcd86a9c2cb0101aeea3f4cc1141c6d902b8e5d4;hb=d1ad2cf60ca694f742e2061a596bc27c7e58f5c8;hpb=03569c70282f68a4bc9b259fbf5b7a2b4c5594b3 diff --git a/config.cpp b/config.cpp index bcd86a9..ec9a0e1 100644 --- a/config.cpp +++ b/config.cpp @@ -9,6 +9,7 @@ #include #include "config.h" +#include "log.h" #include "parse.h" using namespace std; @@ -82,7 +83,7 @@ bool fetch_config_string(const vector &config, const string &keyword } if (config[i].parameters.size() > 0 || config[i].arguments.size() != 1) { - fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str()); + log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str()); return false; } *value = config[i].arguments[0]; @@ -99,7 +100,7 @@ bool fetch_config_int(const vector &config, const string &keyword, i } if (config[i].parameters.size() > 0 || config[i].arguments.size() != 1) { - fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str()); + log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str()); return false; } *value = atoi(config[i].arguments[0].c_str()); // TODO: verify int validity. @@ -111,14 +112,14 @@ bool fetch_config_int(const vector &config, const string &keyword, i bool parse_port(const ConfigLine &line, Config *config) { if (line.arguments.size() != 1) { - fprintf(stderr, "ERROR: 'port' takes exactly one argument\n"); + log(ERROR, "'port' takes exactly one argument"); return false; } AcceptorConfig acceptor; acceptor.port = atoi(line.arguments[0].c_str()); if (acceptor.port < 1 || acceptor.port >= 65536) { - fprintf(stderr, "ERROR: port %d is out of range (must be [1,65536>).\n", acceptor.port); + log(ERROR, "port %d is out of range (must be [1,65536>).", acceptor.port); return false; } @@ -138,9 +139,9 @@ int allocate_mark_pool(int from, int to, Config *config) pool_index = i; } else if ((from >= pool.from && from < pool.to) || (to >= pool.from && to < pool.to)) { - fprintf(stderr, "WARNING: Mark pool %d-%d partially overlaps with %d-%d, you may get duplicate marks.\n", - from, to, pool.from, pool.to); - fprintf(stderr, " Mark pools must either be completely disjunct, or completely overlapping.\n"); + log(WARNING, "Mark pool %d-%d partially overlaps with %d-%d, you may get duplicate marks." + "Mark pools must either be completely disjunct, or completely overlapping.", + from, to, pool.from, pool.to); } } @@ -161,7 +162,7 @@ bool parse_mark_pool(const string &mark_str, int *from, int *to) { size_t split = mark_str.find_first_of('-'); if (split == string::npos) { - fprintf(stderr, "ERROR: Invalid mark specification '%s' (expected 'X-Y').\n", + log(ERROR, "Invalid mark specification '%s' (expected 'X-Y').", mark_str.c_str()); return false; } @@ -172,7 +173,7 @@ bool parse_mark_pool(const string &mark_str, int *from, int *to) *to = atoi(to_str.c_str()); if (*from <= 0 || *from >= 65536 || *to <= 0 || *to >= 65536) { - fprintf(stderr, "ERROR: Mark pool range %d-%d is outside legal range [1,65536>.\n", + log(ERROR, "Mark pool range %d-%d is outside legal range [1,65536>.", *from, *to); return false; } @@ -183,7 +184,7 @@ bool parse_mark_pool(const string &mark_str, int *from, int *to) bool parse_stream(const ConfigLine &line, Config *config) { if (line.arguments.size() != 1) { - fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n"); + log(ERROR, "'stream' takes exactly one argument"); return false; } @@ -192,7 +193,7 @@ bool parse_stream(const ConfigLine &line, Config *config) map::const_iterator src_it = line.parameters.find("src"); if (src_it == line.parameters.end()) { - fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n", + log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.", stream.stream_id.c_str()); } else { stream.src = src_it->second; @@ -222,6 +223,45 @@ bool parse_stream(const ConfigLine &line, Config *config) return true; } +bool parse_error_log(const ConfigLine &line, Config *config) +{ + if (line.arguments.size() != 0) { + log(ERROR, "'error_log' takes no arguments (only parameters type= and filename=)"); + return false; + } + + LogConfig log_config; + map::const_iterator type_it = line.parameters.find("type"); + if (type_it == line.parameters.end()) { + log(ERROR, "'error_log' has no type= parameter"); + return false; + } + + string type = type_it->second; + if (type == "file") { + log_config.type = LogConfig::LOG_TYPE_FILE; + } else if (type == "syslog") { + log_config.type = LogConfig::LOG_TYPE_SYSLOG; + } else if (type == "console") { + log_config.type = LogConfig::LOG_TYPE_CONSOLE; + } else { + log(ERROR, "Unknown log type '%s'", type.c_str()); + return false; + } + + if (log_config.type == LogConfig::LOG_TYPE_FILE) { + map::const_iterator filename_it = line.parameters.find("filename"); + if (filename_it == line.parameters.end()) { + log(ERROR, "error_log type 'file' with no filename= parameter"); + return false; + } + log_config.filename = filename_it->second; + } + + config->log_destinations.push_back(log_config); + return true; +} + bool parse_config(const string &filename, Config *config) { vector lines; @@ -230,11 +270,11 @@ bool parse_config(const string &filename, Config *config) } if (!fetch_config_int(lines, "num_servers", &config->num_servers)) { - fprintf(stderr, "ERROR: Missing 'num_servers' statement in config file.\n"); + log(ERROR, "Missing 'num_servers' statement in config file."); return false; } if (config->num_servers < 1 || config->num_servers >= 20000) { // Insanely high max limit. - fprintf(stderr, "ERROR: 'num_servers' is %d, needs to be in [1, 20000>.\n", config->num_servers); + log(ERROR, "'num_servers' is %d, needs to be in [1, 20000>.", config->num_servers); return false; } @@ -243,7 +283,7 @@ bool parse_config(const string &filename, Config *config) bool has_stats_file = fetch_config_string(lines, "stats_file", &config->stats_file); bool has_stats_interval = fetch_config_int(lines, "stats_interval", &config->stats_interval); if (has_stats_interval && !has_stats_file) { - fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n"); + log(WARNING, "'stats_interval' given, but no 'stats_file'. No statistics will be written."); } for (size_t i = 0; i < lines.size(); ++i) { @@ -260,8 +300,12 @@ bool parse_config(const string &filename, Config *config) if (!parse_stream(line, config)) { return false; } + } else if (line.keyword == "error_log") { + if (!parse_error_log(line, config)) { + return false; + } } else { - fprintf(stderr, "ERROR: Unknown configuration keyword '%s'.\n", + log(ERROR, "Unknown configuration keyword '%s'.", line.keyword.c_str()); return false; }