X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=0c5c62087eb50ebf60fd7192fa069ead9752be69;hp=1e607d4efc50ebbb9ed3936f4990e6b07d14c30c;hb=d1ad2cf60ca694f742e2061a596bc27c7e58f5c8;hpb=03569c70282f68a4bc9b259fbf5b7a2b4c5594b3

diff --git a/httpinput.cpp b/httpinput.cpp
index 1e607d4..0c5c620 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "httpinput.h"
+#include "log.h"
 #include "metacube.h"
 #include "parse.h"
 #include "serverpool.h"
@@ -86,7 +87,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	addrinfo *ai;
 	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
 	if (err == -1) {
-		fprintf(stderr, "WARNING: Lookup of '%s' failed (%s).\n",
+		log(WARNING, "Lookup of '%s' failed (%s).",
 			host.c_str(), gai_strerror(err));
 		freeaddrinfo(ai);
 		return -1;
@@ -122,7 +123,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	}
 
 	// Give the last one as error.
-	fprintf(stderr, "WARNING: Connect to '%s' failed (%s)\n",
+	log(WARNING, "Connect to '%s' failed (%s)",
 	        host.c_str(), strerror(errno));
 	freeaddrinfo(ai);
 	return -1;
@@ -132,20 +133,20 @@ bool HTTPInput::parse_response(const std::string &request)
 {
 	vector<string> lines = split_lines(response);
 	if (lines.empty()) {
-		fprintf(stderr, "WARNING: Empty HTTP response from input.\n");
+		log(WARNING, "Empty HTTP response from input.");
 		return false;
 	}
 
 	vector<string> first_line_tokens = split_tokens(lines[0]);
 	if (first_line_tokens.size() < 2) {
-		fprintf(stderr, "WARNING: Malformed response line '%s' from input.\n",
+		log(WARNING, "Malformed response line '%s' from input.",
 		        lines[0].c_str());
 		return false;
 	}
 
 	int response = atoi(first_line_tokens[1].c_str());
 	if (response != 200) {
-		fprintf(stderr, "WARNING: Non-200 response '%s' from input.\n",
+		log(WARNING, "Non-200 response '%s' from input.",
 			lines[0].c_str());
 		return false;
 	}
@@ -154,7 +155,7 @@ bool HTTPInput::parse_response(const std::string &request)
 	for (size_t i = 1; i < lines.size(); ++i) {
 		size_t split = lines[i].find(":");
 		if (split == string::npos) {
-			fprintf(stderr, "WARNING: Ignoring malformed HTTP response line '%s'\n",
+			log(WARNING, "Ignoring malformed HTTP response line '%s'",
 			        lines[i].c_str());
 			continue;
 		}
@@ -238,7 +239,7 @@ void HTTPInput::do_work()
 			{
 				string protocol;  // Thrown away.
 				if (!parse_url(url, &protocol, &host, &port, &path)) {
-					fprintf(stderr, "Failed to parse URL '%s'\n", url.c_str());
+					log(WARNING, "Failed to parse URL '%s'", url.c_str());
 					break;
 				}
 			}
@@ -295,7 +296,7 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				fprintf(stderr, "Socket unexpectedly closed while reading header\n");
+				log(ERROR, "Socket unexpectedly closed while reading header");
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -303,7 +304,7 @@ void HTTPInput::do_work()
 			RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
 			
 			if (status == RP_OUT_OF_SPACE) {
-				fprintf(stderr, "WARNING: fd %d sent overlong response!\n", sock);
+				log(WARNING, "fd %d sent overlong response!", sock);
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -349,7 +350,7 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				fprintf(stderr, "Socket unexpectedly closed while reading header\n");
+				log(ERROR, "Socket unexpectedly closed while reading header");
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -378,7 +379,7 @@ void HTTPInput::do_work()
 		// or the connection just got closed.
 		// The earlier steps have already given the error message, if any.
 		if (state == NOT_CONNECTED && !should_stop) {
-			fprintf(stderr, "Waiting 0.2 second and restarting...\n");
+			log(INFO, "Waiting 0.2 second and restarting...");
 			usleep(200000);
 		}
 	}
@@ -452,7 +453,7 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	if (num_bytes == 0) {
 		return;
 	}
-	fprintf(stderr, "Warning: Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?\n",
+	log(WARNING, "Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
 		(long long)num_bytes);
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }