X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=httpinput.cpp;h=49333c5f4357c48fa00184c6822931b95759d4b6;hb=c065a02f889b0f1166215278a9430ed1f560f0c2;hp=9412e785b6b15fa41f889a6a6e6acc8fbde8dd86;hpb=924cf08c048e851227143c3f311bc17eb64a6319;p=cubemap

diff --git a/httpinput.cpp b/httpinput.cpp
index 9412e78..49333c5 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -34,7 +34,7 @@ namespace {
 
 string host_header(const string &host, const string &port)
 {
-	if (atoi(port.c_str()) == 80) {
+	if (port == "http" || atoi(port.c_str()) == 80) {
 		return host;
 	} else {
 		return host + ":" + port;
@@ -50,13 +50,18 @@ HTTPInput::HTTPInput(const string &url, Input::Encoding encoding)
 	  url(url),
 	  encoding(encoding),
 	  has_metacube_header(false),
-	  sock(-1)
+	  sock(-1),
+	  num_connection_attempts(0),
+	  suppress_logging(false)
 {
 	pthread_mutex_init(&stats_mutex, NULL);
 	stats.url = url;
 	stats.bytes_received = 0;
 	stats.data_bytes_received = 0;
 	stats.connect_time = -1;
+
+	last_verbose_connection.tv_sec = -3600;
+	last_verbose_connection.tv_nsec = 0;
 }
 
 HTTPInput::HTTPInput(const InputProto &serialized)
@@ -131,8 +136,10 @@ 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 != 0) {
-		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
-			url.c_str(), host.c_str(), gai_strerror(err));
+		if (!suppress_logging) {
+			log(WARNING, "[%s] Lookup of '%s' failed (%s).",
+				url.c_str(), host.c_str(), gai_strerror(err));
+		}
 		return -1;
 	}
 
@@ -200,8 +207,10 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	}
 
 	// Give the last one as error.
-	log(WARNING, "[%s] Connect to '%s' failed (%s)",
-	        url.c_str(), host.c_str(), strerror(errno));
+	if (!suppress_logging) {
+		log(WARNING, "[%s] Connect to '%s' failed (%s)",
+			url.c_str(), host.c_str(), strerror(errno));
+	}
 	freeaddrinfo(base_ai);
 	return -1;
 }
@@ -210,21 +219,27 @@ bool HTTPInput::parse_response(const string &request)
 {
 	vector<string> lines = split_lines(response);
 	if (lines.empty()) {
-		log(WARNING, "[%s] Empty HTTP response from input.", url.c_str());
+		if (!suppress_logging) {
+			log(WARNING, "[%s] Empty HTTP response from input.", url.c_str());
+		}
 		return false;
 	}
 
 	vector<string> first_line_tokens = split_tokens(lines[0]);
 	if (first_line_tokens.size() < 2) {
-		log(WARNING, "[%s] Malformed response line '%s' from input.",
-		        url.c_str(), lines[0].c_str());
+		if (!suppress_logging) {
+			log(WARNING, "[%s] Malformed response line '%s' from input.",
+				url.c_str(), lines[0].c_str());
+		}
 		return false;
 	}
 
 	int response = atoi(first_line_tokens[1].c_str());
 	if (response != 200) {
-		log(WARNING, "[%s] Non-200 response '%s' from input.",
-			url.c_str(), lines[0].c_str());
+		if (!suppress_logging) {
+			log(WARNING, "[%s] Non-200 response '%s' from input.",
+				url.c_str(), lines[0].c_str());
+		}
 		return false;
 	}
 
@@ -296,7 +311,9 @@ void HTTPInput::do_work()
 			timespec elapsed = clock_diff(last_activity, now);
 			if (elapsed.tv_sec >= timeout_secs) {
 				// Timeout!
-				log(ERROR, "[%s] Timeout after %d seconds, closing.", url.c_str(), elapsed.tv_sec);
+				if (!suppress_logging) {
+					log(ERROR, "[%s] Timeout after %d seconds, closing.", url.c_str(), elapsed.tv_sec);
+				}
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -331,7 +348,9 @@ void HTTPInput::do_work()
 			{
 				string protocol, user;  // Thrown away.
 				if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
-					log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
+					if (!suppress_logging) {
+						log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
+					}
 					break;
 				}
 
@@ -343,6 +362,24 @@ void HTTPInput::do_work()
 				}
 			}
 
+			if (suppress_logging) {
+				// See if there's more than one minute since last time we made a connection
+				// with logging enabled. If so, turn it on again.
+				timespec now;
+				int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &now);
+				assert(err != -1);
+
+				double elapsed = now.tv_sec - last_verbose_connection.tv_sec +
+					1e-9 * (now.tv_nsec - last_verbose_connection.tv_nsec);
+				if (elapsed > 60.0) {
+					suppress_logging = false;
+				}
+			}
+			if (!suppress_logging) {
+				int err = clock_gettime(CLOCK_MONOTONIC_COARSE, &last_verbose_connection);
+				assert(err != -1);
+			}
+			++num_connection_attempts;
 			sock = lookup_and_connect(host, port);
 			if (sock != -1) {
 				// Yay, successful connect. Try to set it as nonblocking.
@@ -399,8 +436,10 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
-				           url.c_str());
+				if (!suppress_logging) {
+					log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+						   url.c_str());
+				}
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -408,7 +447,9 @@ void HTTPInput::do_work()
 			RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
 			
 			if (status == RP_OUT_OF_SPACE) {
-				log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
+				if (!suppress_logging) {
+					log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
+				}
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -435,13 +476,15 @@ void HTTPInput::do_work()
 				process_data(&extra_data[0], extra_data.size());
 			}
 
-			if (encoding == Input::INPUT_ENCODING_RAW) {
-				log(INFO, "[%s] Connected to '%s', receiving raw data.",
-					   url.c_str(), url.c_str());
-			} else {
-				assert(encoding == Input::INPUT_ENCODING_METACUBE);
-				log(INFO, "[%s] Connected to '%s', receiving data.",
-					   url.c_str(), url.c_str());
+			if (!suppress_logging) {
+				if (encoding == Input::INPUT_ENCODING_RAW) {
+					log(INFO, "[%s] Connected to '%s', receiving raw data.",
+						   url.c_str(), url.c_str());
+				} else {
+					assert(encoding == Input::INPUT_ENCODING_METACUBE);
+					log(INFO, "[%s] Connected to '%s', receiving data.",
+						   url.c_str(), url.c_str());
+				}
 			}
 			state = RECEIVING_DATA;
 			break;
@@ -462,12 +505,28 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "[%s] Socket unexpectedly closed while reading data",
-				           url.c_str());
+				if (!suppress_logging) {
+					log(ERROR, "[%s] Socket unexpectedly closed while reading data",
+						   url.c_str());
+				}
 				state = CLOSING_SOCKET;
 				continue;
 			}
 
+			num_connection_attempts = 0;  // Reset, since we have a successful read.
+			if (suppress_logging) {
+				// This was suppressed earlier, so print it out now.
+				if (encoding == Input::INPUT_ENCODING_RAW) {
+					log(INFO, "[%s] Connected to '%s', receiving raw data.",
+						   url.c_str(), url.c_str());
+				} else {
+					assert(encoding == Input::INPUT_ENCODING_METACUBE);
+					log(INFO, "[%s] Connected to '%s', receiving data.",
+						   url.c_str(), url.c_str());
+				}
+				suppress_logging = false;
+			}
+
 			process_data(buf, ret);
 			break;
 		}
@@ -484,7 +543,15 @@ 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()) {
-			log(INFO, "[%s] Waiting 0.2 second and restarting...", url.c_str());
+			if (!suppress_logging) {
+				log(INFO, "[%s] Waiting 0.2 seconds and restarting...", url.c_str());
+			}
+
+			if (num_connection_attempts >= 3 && !suppress_logging) {
+				log(INFO, "[%s] %d failed connection attempts, suppressing logging for one minute.",
+					url.c_str(), num_connection_attempts);
+				suppress_logging = true;
+			}
 			timespec timeout_ts;
 			timeout_ts.tv_sec = 0;
 			timeout_ts.tv_nsec = 200000000;
@@ -495,7 +562,6 @@ void HTTPInput::do_work()
 
 void HTTPInput::process_data(char *ptr, size_t bytes)
 {
-	pending_data.insert(pending_data.end(), ptr, ptr + bytes);
 	{
 		MutexLock mutex(&stats_mutex);
 		stats.bytes_received += bytes;
@@ -509,6 +575,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 	}
 
 	assert(encoding == Input::INPUT_ENCODING_METACUBE);
+	pending_data.insert(pending_data.end(), ptr, ptr + bytes);
 
 	for ( ;; ) {
 		// If we don't have enough data (yet) for even the Metacube header, just return.