X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=f6a99792afafea4da0bd7fe960808a376327b6e1;hp=291b17f089578fe54b2a4ac33be06bfafc1742f4;hb=e666e2735bf831084d744027b844de9f4d3fe34d;hpb=51e357cb8decceaeab47332492962bc0175b0b13

diff --git a/httpinput.cpp b/httpinput.cpp
index 291b17f..f6a9979 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,31 +1,27 @@
+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <netdb.h>
-#include <poll.h>
-#include <signal.h>
-#include <errno.h>
-#include <vector>
-#include <string>
+#include <unistd.h>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "metacube.h"
-#include "mutexlock.h"
 #include "httpinput.h"
-#include "server.h"
-#include "serverpool.h"
+#include "log.h"
+#include "metacube.h"
 #include "parse.h"
-#include "version.h"
+#include "serverpool.h"
 #include "state.pb.h"
+#include "version.h"
 
 using namespace std;
 
@@ -66,7 +62,7 @@ void HTTPInput::close_socket()
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close()");
+		log_perror("close()");
 	}
 }
 
@@ -91,8 +87,8 @@ 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",
-			host.c_str(), gai_strerror(err));
+		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
+			stream_id.c_str(), host.c_str(), gai_strerror(err));
 		freeaddrinfo(ai);
 		return -1;
 	}
@@ -119,7 +115,7 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 		} while (err == -1 && errno == EINTR);
 
 		if (err == -1) {
-			perror("close");
+			log_perror("close");
 			// Can still continue.
 		}
 
@@ -127,8 +123,8 @@ 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",
-	        host.c_str(), strerror(errno));
+	log(WARNING, "[%s] Connect to '%s' failed (%s)",
+	        stream_id.c_str(), host.c_str(), strerror(errno));
 	freeaddrinfo(ai);
 	return -1;
 }
@@ -137,21 +133,21 @@ 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, "[%s] Empty HTTP response from input.", stream_id.c_str());
 		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",
-		        lines[0].c_str());
+		log(WARNING, "[%s] Malformed response line '%s' from input.",
+		        stream_id.c_str(), 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",
-			lines[0].c_str());
+		log(WARNING, "[%s] Non-200 response '%s' from input.",
+			stream_id.c_str(), lines[0].c_str());
 		return false;
 	}
 
@@ -159,8 +155,8 @@ 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",
-			        lines[i].c_str());
+			log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
+			        stream_id.c_str(), lines[i].c_str());
 			continue;
 		}
 
@@ -227,7 +223,7 @@ void HTTPInput::do_work()
 				continue;
 			}
 			if (nfds == -1) {
-				perror("poll");
+				log_perror("poll");
 				state = CLOSING_SOCKET;
 			}
 		}
@@ -238,11 +234,12 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
+			servers->set_header(stream_id, "");
 
 			{
 				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, "[%s] Failed to parse URL '%s'", stream_id.c_str(), url.c_str());
 					break;
 				}
 			}
@@ -252,7 +249,7 @@ void HTTPInput::do_work()
 				// Yay, successful connect. Try to set it as nonblocking.
 				int one = 1;
 				if (ioctl(sock, FIONBIO, &one) == -1) {
-					perror("ioctl(FIONBIO)");
+					log_perror("ioctl(FIONBIO)");
 					state = CLOSING_SOCKET;
 				} else {
 					state = SENDING_REQUEST;
@@ -270,7 +267,7 @@ void HTTPInput::do_work()
 			} while (ret == -1 && errno == EINTR);
 
 			if (ret == -1) {
-				perror("write");
+				log_perror("write");
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -292,14 +289,15 @@ void HTTPInput::do_work()
 			} while (ret == -1 && errno == EINTR);
 
 			if (ret == -1) {
-				perror("read");
+				log_perror("read");
 				state = CLOSING_SOCKET;
 				continue;
 			}
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				fprintf(stderr, "Socket unexpectedly closed while reading header\n");
+				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				           stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -307,7 +305,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, "[%s] Sever sent overlong HTTP response!", stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -334,6 +332,8 @@ void HTTPInput::do_work()
 				process_data(&extra_data[0], extra_data.size());
 			}
 
+			log(INFO, "[%s] Connected to '%s', receiving data.",
+				   stream_id.c_str(), url.c_str());
 			state = RECEIVING_DATA;
 			break;
 		}
@@ -346,14 +346,15 @@ void HTTPInput::do_work()
 			} while (ret == -1 && errno == EINTR);
 
 			if (ret == -1) {
-				perror("read");
+				log_perror("read");
 				state = CLOSING_SOCKET;
 				continue;
 			}
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				fprintf(stderr, "Socket unexpectedly closed while reading header\n");
+				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				           stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -368,7 +369,7 @@ void HTTPInput::do_work()
 			} while (err == -1 && errno == EINTR);
 
 			if (err == -1) {
-				perror("close");
+				log_perror("close");
 			}
 
 			state = NOT_CONNECTED;
@@ -382,7 +383,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, "[%s] Waiting 0.2 second and restarting...", stream_id.c_str());
 			usleep(200000);
 		}
 	}
@@ -456,8 +457,8 @@ 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",
-		(long long)num_bytes);
+	log(WARNING, "[%s] Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
+		stream_id.c_str(), (long long)num_bytes);
 	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
 }