X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=64cab64f40c7def8dd7ce744d29b2cd95a9fbef1;hp=8ac7802bb30454f690822e1d7761ed06b8080bf9;hb=14aa32dce539ac645ba10e8c488fb5a435ffa314;hpb=488f28bf7070f44469a006ed4a9d4c423788d175

diff --git a/main.cpp b/main.cpp
index 8ac7802..64cab64 100644
--- 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;
@@ -300,8 +303,6 @@ start:
 	// Find all streams in the configuration file, and create them.
 	create_streams(config, deserialized_stream_ids, &deserialized_inputs);
 
-	servers->run();
-
 	vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
 	vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
 	
@@ -314,6 +315,8 @@ start:
 	for (int i = 0; i < loaded_state.clients_size(); ++i) {
 		servers->add_client_from_serialized(loaded_state.clients(i));
 	}
+	
+	servers->run();
 
 	// Start writing statistics.
 	StatsThread *stats_thread = NULL;
@@ -322,8 +325,6 @@ start:
 		stats_thread->run();
 	}
 
-	signal(SIGHUP, hup);
-	
 	struct timeval server_start;
 	gettimeofday(&server_start, NULL);
 	if (state_fd != -1) {