#include <assert.h>
#include <errno.h>
#include <getopt.h>
-#include <google/protobuf/stubs/common.h>
+#include <limits.h>
#include <signal.h>
#include <stddef.h>
#include <stdio.h>
#include <utility>
#include <vector>
+#include "accesslog.h"
#include "acceptor.h"
#include "config.h"
#include "input.h"
+#include "log.h"
#include "markpool.h"
#include "serverpool.h"
#include "state.pb.h"
using namespace std;
+AccessLogThread *access_log = NULL;
ServerPool *servers = NULL;
+vector<MarkPool *> mark_pools;
volatile bool hupped = false;
+volatile bool stopped = false;
-void hup(int ignored)
+void hup(int signum)
{
hupped = true;
+ if (signum == SIGINT) {
+ stopped = true;
+ }
}
CubemapStateProto collect_state(const timeval &serialize_start,
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;
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;
}
const set<string> &deserialized_stream_ids,
map<string, Input *> *deserialized_inputs)
{
- vector<MarkPool *> 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));
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);
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<LogConfig> &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());
pid_t pid = fork();
switch (pid) {
case -1:
- perror("fork()");
+ 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);
- perror(argv0_copy);
+ log_perror(argv0_copy);
_exit(1);
default:
// Parent.
} while (err == -1 && errno == EINTR);
if (err == -1) {
- perror("waitpid()");
+ log_perror("waitpid()");
return false;
}
int main(int argc, char **argv)
{
+ signal(SIGHUP, hup);
+ signal(SIGINT, hup);
+ signal(SIGPIPE, SIG_IGN);
+
// Parse options.
int state_fd = -1;
bool test_config = false;
static const option long_options[] = {
{ "state", required_argument, 0, 's' },
{ "test-config", no_argument, 0, 't' },
+ { 0, 0, 0, 0 }
};
int option_index = 0;
- int c = getopt_long (argc, argv, "s:t", long_options, &option_index);
+ int c = getopt_long(argc, argv, "s:t", long_options, &option_index);
if (c == -1) {
break;
test_config = true;
break;
default:
- assert(false);
+ fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
+ exit(1);
}
}
config_filename = argv[optind++];
}
+ // 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:
- fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
+ // 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;
map<string, Input *> deserialized_inputs;
map<int, Acceptor *> deserialized_acceptors;
if (state_fd != -1) {
- fprintf(stderr, "Deserializing state from previous process... ");
+ log(INFO, "Deserializing state from previous process...");
string serialized;
if (!read_tempfile(state_fd, &serialized)) {
exit(1);
}
if (!loaded_state.ParseFromString(serialized)) {
- fprintf(stderr, "ERROR: Failed deserialization of state.\n");
+ log(ERROR, "Failed deserialization of state.");
exit(1);
}
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<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
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;
stats_thread->run();
}
- signal(SIGHUP, hup);
-
struct timeval server_start;
gettimeofday(&server_start, NULL);
if (state_fd != -1) {
// “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) {
if (stats_thread != NULL) {
stats_thread->stop();
+ delete stats_thread;
}
for (size_t i = 0; i < acceptors.size(); ++i) {
acceptors[i]->stop();
}
servers->stop();
- fprintf(stderr, "Serializing state and re-execing...\n");
- CubemapStateProto state = collect_state(
- serialize_start, acceptors, inputs, servers);
- string serialized;
- state.SerializeToString(&serialized);
- state_fd = make_tempfile(serialized);
- if (state_fd == -1) {
- exit(1);
+ 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;
- if (!dry_run_config(argv[0], config_filename)) {
- fprintf(stderr, "ERROR: %s --test-config failed. Restarting old version instead of new.\n", argv[0]);
+ 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;
}
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);
}
}
projects / cubemap / blobdiff