New run of include-what-you-use.

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index 77acf6dd61cac95c6a4792446a42bc99ff6def29..c5547bda4f5d62ef155ffa4cf1381819658c90f4 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -207,6 +207,18 @@ bool parse_stream(const ConfigLine &line, Config *config)
                stream.backlog_size = atoi(backlog_it->second.c_str());
        }
 
+       // Parse encoding.
+       map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
+       if (encoding_parm_it == line.parameters.end() ||
+           encoding_parm_it->second == "raw") {
+               stream.encoding = StreamConfig::STREAM_ENCODING_RAW;
+       } else if (encoding_parm_it->second == "metacube") {
+               stream.encoding = StreamConfig::STREAM_ENCODING_METACUBE;
+       } else {
+               log(ERROR, "Parameter 'encoding' must be either 'raw' (default) or 'metacube'");
+               return false;
+       }
+
        // Parse marks, if so desired.
        map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
        if (mark_parm_it == line.parameters.end()) {
@@ -287,12 +299,15 @@ bool parse_config(const string &filename, Config *config)
        if (has_stats_interval && !has_stats_file) {
                log(WARNING, "'stats_interval' given, but no 'stats_file'. No statistics will be written.");
        }
+       
+       fetch_config_string(lines, "access_log", &config->access_log_file);
 
        for (size_t i = 0; i < lines.size(); ++i) {
                const ConfigLine &line = lines[i];
                if (line.keyword == "num_servers" ||
                    line.keyword == "stats_file" ||
-                   line.keyword == "stats_interval") {
+                   line.keyword == "stats_interval" ||
+                   line.keyword == "access_log") {
                        // Already taken care of, above.
                } else if (line.keyword == "port") {
                        if (!parse_port(line, config)) {