]> git.sesse.net Git - cubemap/blobdiff - main.cpp
Remove an include IWYU should not have added.
[cubemap] / main.cpp
index 8ac7802bb30454f690822e1d7761ed06b8080bf9..95a72b83f00440bf92b612a30bdbba208329d9f7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <getopt.h>
-#include <google/protobuf/stubs/common.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -146,6 +145,8 @@ void create_streams(const Config &config,
                const StreamConfig &stream_config = config.streams[i];
                if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
                        servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
+               } else {
+                       servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
                }
                expecting_stream_ids.erase(stream_config.stream_id);
 
@@ -212,6 +213,8 @@ bool dry_run_config(const std::string &argv0, const std::string &config_filename
 
 int main(int argc, char **argv)
 {
+       signal(SIGHUP, hup);
+       
        // Parse options.
        int state_fd = -1;
        bool test_config = false;
@@ -322,8 +325,6 @@ start:
                stats_thread->run();
        }
 
-       signal(SIGHUP, hup);
-       
        struct timeval server_start;
        gettimeofday(&server_start, NULL);
        if (state_fd != -1) {