From b2a5d0a3b9e6ad819ec7d9b427f94a58177e6dae Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Tue, 16 Apr 2013 01:07:37 +0200
Subject: [PATCH] Identify HTTPInput error messages by the stream.

---
 httpinput.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/httpinput.cpp b/httpinput.cpp
index 962be2a..8a3c371 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -87,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) {
-		log(WARNING, "Lookup of '%s' failed (%s).",
-			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;
 	}
@@ -123,8 +123,8 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 	}
 
 	// Give the last one as error.
-	log(WARNING, "Connect to '%s' failed (%s)",
-	        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;
 }
@@ -133,21 +133,21 @@ bool HTTPInput::parse_response(const std::string &request)
 {
 	vector<string> lines = split_lines(response);
 	if (lines.empty()) {
-		log(WARNING, "Empty HTTP response from input.");
+		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) {
-		log(WARNING, "Malformed response line '%s' from input.",
-		        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) {
-		log(WARNING, "Non-200 response '%s' from input.",
-			lines[0].c_str());
+		log(WARNING, "[%s] Non-200 response '%s' from input.",
+			stream_id.c_str(), lines[0].c_str());
 		return false;
 	}
 
@@ -155,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) {
-			log(WARNING, "Ignoring malformed HTTP response line '%s'",
-			        lines[i].c_str());
+			log(WARNING, "[%s] Ignoring malformed HTTP response line '%s'",
+			        stream_id.c_str(), lines[i].c_str());
 			continue;
 		}
 
@@ -239,7 +239,7 @@ void HTTPInput::do_work()
 			{
 				string protocol;  // Thrown away.
 				if (!parse_url(url, &protocol, &host, &port, &path)) {
-					log(WARNING, "Failed to parse URL '%s'", url.c_str());
+					log(WARNING, "[%s] Failed to parse URL '%s'", stream_id.c_str(), url.c_str());
 					break;
 				}
 			}
@@ -296,7 +296,8 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "Socket unexpectedly closed while reading header");
+				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				           stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -304,7 +305,7 @@ void HTTPInput::do_work()
 			RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
 			
 			if (status == RP_OUT_OF_SPACE) {
-				log(WARNING, "fd %d sent overlong response!", sock);
+				log(WARNING, "[%s] Sever sent overlong HTTP response!", stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			} else if (status == RP_NOT_FINISHED_YET) {
@@ -350,7 +351,8 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "Socket unexpectedly closed while reading header");
+				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				           stream_id.c_str());
 				state = CLOSING_SOCKET;
 				continue;
 			}
@@ -379,7 +381,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) {
-			log(INFO, "Waiting 0.2 second and restarting...");
+			log(INFO, "[%s] Waiting 0.2 second and restarting...", stream_id.c_str());
 			usleep(200000);
 		}
 	}
@@ -453,8 +455,8 @@ void HTTPInput::drop_pending_data(size_t num_bytes)
 	if (num_bytes == 0) {
 		return;
 	}
-	log(WARNING, "Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?",
-		(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);
 }
 
-- 
2.39.2