]> git.sesse.net Git - cubemap/blobdiff - main.cpp
Fix incorrect struct/class in forward declares (found by Clang).
[cubemap] / main.cpp
index e48bdf1f7761c2933d8279810602cbccd2a724ca..1369c9faeb8f42394e1afe4b0878f4831592f3a7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -154,7 +154,7 @@ void create_streams(const Config &config,
        for (unsigned i = 0; i < config.streams.size(); ++i) {
                const StreamConfig &stream_config = config.streams[i];
                if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
-                       servers->add_stream(stream_config.stream_id);
+                       servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
                }
                expecting_stream_ids.erase(stream_config.stream_id);
 
@@ -272,7 +272,7 @@ start:
        if (state_fd != -1) {
                fprintf(stderr, "Deserializing state from previous process... ");
                string serialized;
-               if (!read_tempfile(atoi(argv[3]), &serialized)) {
+               if (!read_tempfile(state_fd, &serialized)) {
                        exit(1);
                }
                if (!loaded_state.ParseFromString(serialized)) {
@@ -329,8 +329,6 @@ start:
        if (!config.stats_file.empty()) {
                stats_thread = new StatsThread(config.stats_file, config.stats_interval);
                stats_thread->run();
-       } else if (config.stats_interval != -1) {
-               fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
        }
 
        signal(SIGHUP, hup);