X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=8825631771ffe80fe4ca3a7baa5261e2748f1083;hp=e8fa4e822ce720be53dc29f03de40ed31b1addc6;hb=d1ad2cf60ca694f742e2061a596bc27c7e58f5c8;hpb=03569c70282f68a4bc9b259fbf5b7a2b4c5594b3

diff --git a/main.cpp b/main.cpp
index e8fa4e8..8825631 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,6 +18,7 @@
 #include "acceptor.h"
 #include "config.h"
 #include "input.h"
+#include "log.h"
 #include "markpool.h"
 #include "serverpool.h"
 #include "state.pb.h"
@@ -108,7 +109,7 @@ vector<Input *> 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;
@@ -119,7 +120,7 @@ vector<Input *> 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;
 			}
@@ -162,9 +163,9 @@ 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);
@@ -172,6 +173,22 @@ void create_streams(const Config &config,
 	}
 }
 	
+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());
@@ -256,7 +273,10 @@ int main(int argc, char **argv)
 	}
 
 start:
-	fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
+	// Open logs as soon as possible.
+	open_logs(config.log_destinations);
+
+	log(NO_LEVEL, "Cubemap " SERVER_VERSION " starting.");
 	servers = new ServerPool(config.num_servers);
 
 	CubemapStateProto loaded_state;
@@ -265,13 +285,13 @@ start:
 	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);
 		}
 
@@ -298,7 +318,7 @@ start:
 				new Acceptor(loaded_state.acceptors(i))));
 		}
 
-		fprintf(stderr, "done.\n");
+		log(INFO, "Deserialization done.");
 	}
 
 	// Find all streams in the configuration file, and create them.
@@ -334,7 +354,7 @@ start:
 		// “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) {
@@ -355,7 +375,7 @@ start:
 	}
 	servers->stop();
 
-	fprintf(stderr, "Serializing state and re-execing...\n");
+	log(INFO, "Serializing state and re-execing...");
 	CubemapStateProto state = collect_state(
                 serialize_start, acceptors, inputs, servers);
 	string serialized;
@@ -365,20 +385,26 @@ start:
 		exit(1);
 	}
 	delete servers;
+	shut_down_logging();
 
 	if (!dry_run_config(argv[0], config_filename)) {
-		fprintf(stderr, "ERROR: %s --test-config failed. Restarting old version instead of new.\n", argv[0]);
+		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);
+		open_logs(config.log_destinations);
 		perror("execlp");
-		fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]);
+		log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv[0]);
+		shut_down_logging();
 		usleep(200000);
 	}
 }