X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=serverpool.cpp;h=8e233dafe8d9fb319bb29e09e6b4974b4ddedaad;hb=061988af511f42da3cd584b4d983177504ddc177;hp=232ccea72a1acdc01fef8104c8f7048e7cb28a8c;hpb=a0fe013448d188b324c00383cfd91695d9d3d076;p=cubemap

diff --git a/serverpool.cpp b/serverpool.cpp
index 232ccea..8e233da 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -16,9 +16,7 @@ using namespace std;
 
 ServerPool::ServerPool(int size)
 	: servers(new Server[size]),
-	  num_servers(size),
-	  clients_added(0),
-	  num_http_streams(0)
+	  num_servers(size)
 {
 }
 
@@ -26,8 +24,10 @@ CubemapStateProto ServerPool::serialize()
 {
 	CubemapStateProto state;
 
+	unordered_map<const string *, size_t> short_response_pool;
+
 	for (int i = 0; i < num_servers; ++i) {
-                CubemapStateProto local_state = servers[i].serialize();
+                CubemapStateProto local_state = servers[i].serialize(&short_response_pool);
 
 		// The stream state should be identical between the servers, so we only store it once,
 		// save for the fds, which we keep around to distribute to the servers after re-exec.
@@ -45,6 +45,13 @@ CubemapStateProto ServerPool::serialize()
 		}
         }
 
+	for (size_t i = 0; i < short_response_pool.size(); ++i) {
+		state.mutable_short_response_pool()->Add();
+	}
+	for (const auto &string_and_index : short_response_pool) {
+		state.mutable_short_response_pool(string_and_index.second)->set_header_or_short_response(*string_and_index.first);
+	}
+
 	return state;
 }
 
@@ -53,9 +60,9 @@ void ServerPool::add_client(int sock, Acceptor *acceptor)
 	servers[clients_added++ % num_servers].add_client_deferred(sock, acceptor);
 }
 
-void ServerPool::add_client_from_serialized(const ClientProto &client)
+void ServerPool::add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses)
 {
-	servers[clients_added++ % num_servers].add_client_from_serialized(client);
+	servers[clients_added++ % num_servers].add_client_from_serialized(client, short_responses);
 }
 
 int ServerPool::lookup_stream_by_url(const string &url) const