X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=55548bae91e832c02450a2196bf9778cea39453f;hp=64ee29f55fb55b924eb0632935876b5a3cc56ef1;hb=0f8e26eb85f86b7b543243f8e98938eeec909e31;hpb=36bf9e6f11b86bb15007993ac7df5e2a651eb3e1 diff --git a/main.cpp b/main.cpp index 64ee29f..55548ba 100644 --- a/main.cpp +++ b/main.cpp @@ -1,74 +1,47 @@ -#include -#include -#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include "accesslog.h" #include "acceptor.h" #include "config.h" +#include "input.h" +#include "log.h" #include "markpool.h" -#include "metacube.h" -#include "parse.h" -#include "server.h" #include "serverpool.h" -#include "input.h" +#include "state.pb.h" #include "stats.h" +#include "util.h" #include "version.h" -#include "state.pb.h" using namespace std; +AccessLogThread *access_log = NULL; ServerPool *servers = NULL; +vector mark_pools; volatile bool hupped = false; +volatile bool stopped = false; -void hup(int ignored) +void hup(int signum) { hupped = true; -} - -// Serialize the given state to a file descriptor, and return the (still open) -// descriptor. -int make_tempfile(const CubemapStateProto &state) -{ - char tmpl[] = "/tmp/cubemapstate.XXXXXX"; - int state_fd = mkstemp(tmpl); - if (state_fd == -1) { - perror("mkstemp"); - exit(1); - } - - string serialized; - state.SerializeToString(&serialized); - - const char *ptr = serialized.data(); - size_t to_write = serialized.size(); - while (to_write > 0) { - ssize_t ret = write(state_fd, ptr, to_write); - if (ret == -1) { - perror("write"); - exit(1); - } - - ptr += ret; - to_write -= ret; + if (signum == SIGINT) { + stopped = true; } - - return state_fd; } CubemapStateProto collect_state(const timeval &serialize_start, @@ -91,42 +64,6 @@ CubemapStateProto collect_state(const timeval &serialize_start, return state; } -// Read the state back from the file descriptor made by make_tempfile, -// and close it. -CubemapStateProto read_tempfile(int state_fd) -{ - if (lseek(state_fd, 0, SEEK_SET) == -1) { - perror("lseek"); - exit(1); - } - - string serialized; - char buf[4096]; - for ( ;; ) { - ssize_t ret = read(state_fd, buf, sizeof(buf)); - if (ret == -1) { - perror("read"); - exit(1); - } - if (ret == 0) { - // EOF. - break; - } - - serialized.append(string(buf, buf + ret)); - } - - close(state_fd); // Implicitly deletes the file. - - CubemapStateProto state; - if (!state.ParseFromString(serialized)) { - fprintf(stderr, "PANIC: Failed deserialization of state.\n"); - exit(1); - } - - return state; -} - // Find all port statements in the configuration file, and create acceptors for htem. vector create_acceptors( const Config &config, @@ -180,7 +117,7 @@ vector create_inputs(const Config &config, if (deserialized_input_it != deserialized_inputs->end()) { input = deserialized_input_it->second; if (input->get_url() != src) { - fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n", + log(INFO, "Stream '%s' has changed URL from '%s' to '%s', restarting input.", stream_id.c_str(), input->get_url().c_str(), src.c_str()); input->close_socket(); delete input; @@ -191,7 +128,7 @@ vector create_inputs(const Config &config, if (input == NULL) { input = create_input(stream_id, src); if (input == NULL) { - fprintf(stderr, "ERROR: did not understand URL '%s', clients will not get any data.\n", + log(ERROR, "did not understand URL '%s', clients will not get any data.", src.c_str()); continue; } @@ -206,7 +143,6 @@ void create_streams(const Config &config, const set &deserialized_stream_ids, map *deserialized_inputs) { - vector mark_pools; // FIXME: leak for (unsigned i = 0; i < config.mark_pools.size(); ++i) { const MarkPoolConfig &mp_config = config.mark_pools[i]; mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to)); @@ -216,7 +152,9 @@ 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); + } else { + servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size); } expecting_stream_ids.erase(stream_config.stream_id); @@ -232,28 +170,87 @@ void create_streams(const Config &config, stream_it != expecting_stream_ids.end(); ++stream_it) { string stream_id = *stream_it; - fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n", - stream_id.c_str()); - fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n"); + log(WARNING, "stream '%s' disappeared from the configuration file. " + "It will not be deleted, but clients will not get any new inputs.", + stream_id.c_str()); if (deserialized_inputs->count(stream_id) != 0) { delete (*deserialized_inputs)[stream_id]; deserialized_inputs->erase(stream_id); } } } + +void open_logs(const vector &log_destinations) +{ + for (size_t i = 0; i < log_destinations.size(); ++i) { + if (log_destinations[i].type == LogConfig::LOG_TYPE_FILE) { + add_log_destination_file(log_destinations[i].filename); + } else if (log_destinations[i].type == LogConfig::LOG_TYPE_CONSOLE) { + add_log_destination_console(); + } else if (log_destinations[i].type == LogConfig::LOG_TYPE_SYSLOG) { + add_log_destination_syslog(); + } else { + assert(false); + } + } + start_logging(); +} + +bool dry_run_config(const std::string &argv0, const std::string &config_filename) +{ + char *argv0_copy = strdup(argv0.c_str()); + char *config_filename_copy = strdup(config_filename.c_str()); + + pid_t pid = fork(); + switch (pid) { + case -1: + log_perror("fork()"); + free(argv0_copy); + free(config_filename_copy); + return false; + case 0: + // Child. + execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL); + log_perror(argv0_copy); + _exit(1); + default: + // Parent. + break; + } + + free(argv0_copy); + free(config_filename_copy); + + int status; + pid_t err; + do { + err = waitpid(pid, &status, 0); + } while (err == -1 && errno == EINTR); + + if (err == -1) { + log_perror("waitpid()"); + return false; + } + + return (WIFEXITED(status) && WEXITSTATUS(status) == 0); +} int main(int argc, char **argv) { - fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n"); - + signal(SIGHUP, hup); + signal(SIGINT, hup); + signal(SIGPIPE, SIG_IGN); + // Parse options. int state_fd = -1; + bool test_config = false; for ( ;; ) { static const option long_options[] = { { "state", required_argument, 0, 's' }, + { "test-config", no_argument, 0, 't' }, }; int option_index = 0; - int c = getopt_long (argc, argv, "s:", long_options, &option_index); + int c = getopt_long (argc, argv, "s:t", long_options, &option_index); if (c == -1) { break; @@ -262,6 +259,9 @@ int main(int argc, char **argv) case 's': state_fd = atoi(optarg); break; + case 't': + test_config = true; + break; default: assert(false); } @@ -272,22 +272,68 @@ int main(int argc, char **argv) config_filename = argv[optind++]; } - struct timeval serialize_start; + // Canonicalize argv[0] and config_filename. + char argv0_canon[PATH_MAX]; + char config_filename_canon[PATH_MAX]; + if (realpath(argv[0], argv0_canon) == NULL) { + log_perror(argv[0]); + exit(1); + } + if (realpath(config_filename.c_str(), config_filename_canon) == NULL) { + log_perror(config_filename.c_str()); + exit(1); + } + + // Now parse the configuration file. Config config; - if (!parse_config(config_filename, &config)) { + if (!parse_config(config_filename_canon, &config)) { exit(1); } + if (test_config) { + exit(0); + } + + // Ideally we'd like to daemonize only when we've started up all threads etc., + // but daemon() forks, which is not good in multithreaded software, so we'll + // have to do it here. + if (config.daemonize) { + if (daemon(0, 0) == -1) { + log_perror("daemon"); + exit(1); + } + } + +start: + // Open logs as soon as possible. + open_logs(config.log_destinations); + + log(INFO, "Cubemap " SERVER_VERSION " starting."); + if (config.access_log_file.empty()) { + // Create a dummy logger. + access_log = new AccessLogThread(); + } else { + access_log = new AccessLogThread(config.access_log_file); + } + access_log->run(); servers = new ServerPool(config.num_servers); CubemapStateProto loaded_state; + struct timeval serialize_start; set deserialized_stream_ids; map deserialized_inputs; map deserialized_acceptors; if (state_fd != -1) { - fprintf(stderr, "Deserializing state from previous process... "); - loaded_state = read_tempfile(state_fd); + log(INFO, "Deserializing state from previous process..."); + string serialized; + if (!read_tempfile(state_fd, &serialized)) { + exit(1); + } + if (!loaded_state.ParseFromString(serialized)) { + log(ERROR, "Failed deserialization of state."); + exit(1); + } serialize_start.tv_sec = loaded_state.serialize_start_sec(); serialize_start.tv_usec = loaded_state.serialize_start_usec(); @@ -305,13 +351,6 @@ int main(int argc, char **argv) create_input(loaded_state.inputs(i)))); } - // Convert the acceptor from older serialized formats. - if (loaded_state.has_server_sock() && loaded_state.has_port()) { - AcceptorProto *acceptor = loaded_state.add_acceptors(); - acceptor->set_server_sock(loaded_state.server_sock()); - acceptor->set_port(loaded_state.port()); - } - // Deserialize the acceptors. for (int i = 0; i < loaded_state.acceptors_size(); ++i) { deserialized_acceptors.insert(make_pair( @@ -319,14 +358,12 @@ int main(int argc, char **argv) new Acceptor(loaded_state.acceptors(i)))); } - fprintf(stderr, "done.\n"); + log(INFO, "Deserialization done."); } // Find all streams in the configuration file, and create them. create_streams(config, deserialized_stream_ids, &deserialized_inputs); - servers->run(); - vector acceptors = create_acceptors(config, &deserialized_acceptors); vector inputs = create_inputs(config, &deserialized_inputs); @@ -339,18 +376,16 @@ int main(int argc, char **argv) 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; 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); - struct timeval server_start; gettimeofday(&server_start, NULL); if (state_fd != -1) { @@ -359,7 +394,7 @@ int main(int argc, char **argv) // “glitch” period was, not counting of course reconnects if the configuration changed. double glitch_time = server_start.tv_sec - serialize_start.tv_sec + 1e-6 * (server_start.tv_usec - serialize_start.tv_usec); - fprintf(stderr, "Re-exec happened in approx. %.0f ms.\n", glitch_time * 1000.0); + log(INFO, "Re-exec happened in approx. %.0f ms.", glitch_time * 1000.0); } while (!hupped) { @@ -371,6 +406,7 @@ int main(int argc, char **argv) if (stats_thread != NULL) { stats_thread->stop(); + delete stats_thread; } for (size_t i = 0; i < acceptors.size(); ++i) { acceptors[i]->stop(); @@ -380,18 +416,53 @@ int main(int argc, char **argv) } servers->stop(); - fprintf(stderr, "Serializing state and re-execing...\n"); - state_fd = make_tempfile(collect_state( - serialize_start, acceptors, inputs, servers)); + CubemapStateProto state; + if (stopped) { + log(INFO, "Shutting down."); + } else { + log(INFO, "Serializing state and re-execing..."); + state = collect_state( + serialize_start, acceptors, inputs, servers); + string serialized; + state.SerializeToString(&serialized); + state_fd = make_tempfile(serialized); + if (state_fd == -1) { + exit(1); + } + } delete servers; + + for (unsigned i = 0; i < mark_pools.size(); ++i) { + delete mark_pools[i]; + } + mark_pools.clear(); + + access_log->stop(); + delete access_log; + shut_down_logging(); + + if (stopped) { + exit(0); + } + + // OK, so the signal was SIGHUP. Check that the new config is okay, then exec the new binary. + if (!dry_run_config(argv0_canon, config_filename_canon)) { + open_logs(config.log_destinations); + log(ERROR, "%s --test-config failed. Restarting old version instead of new.", argv[0]); + hupped = false; + shut_down_logging(); + goto start; + } char buf[16]; sprintf(buf, "%d", state_fd); for ( ;; ) { - execlp(argv[0], argv[0], config_filename.c_str(), "--state", buf, NULL); - perror("execlp"); - fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]); + execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, NULL); + open_logs(config.log_destinations); + log_perror("execlp"); + log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv0_canon); + shut_down_logging(); usleep(200000); } }