X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=8a3c371a7df88a618caa92227be4b77e50bf110c;hp=012f5bc0c4f15d2a4da0f425034a7c82a50ff763;hb=0d72f384a1de672824298262ba5c427ec0aee2d6;hpb=742f56c25bdd54dc438b21cb5e422de520bc7231 diff --git a/httpinput.cpp b/httpinput.cpp index 012f5bc..8a3c371 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -1,30 +1,27 @@ +#include +#include +#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include -#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; @@ -57,6 +54,18 @@ HTTPInput::HTTPInput(const InputProto &serialized) parse_url(url, &protocol, &host, &port, &path); // Don't care if it fails. } +void HTTPInput::close_socket() +{ + int ret; + do { + ret = close(sock); + } while (ret == -1 && errno == EINTR); + + if (ret == -1) { + log_perror("close()"); + } +} + InputProto HTTPInput::serialize() const { InputProto serialized; @@ -78,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; } @@ -101,12 +110,21 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port) return sock; } + do { + err = close(sock); + } while (err == -1 && errno == EINTR); + + if (err == -1) { + log_perror("close"); + // Can still continue. + } + ai = ai->ai_next; } // 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; } @@ -115,21 +133,21 @@ bool HTTPInput::parse_response(const std::string &request) { vector 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 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; } @@ -137,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; } @@ -205,7 +223,7 @@ void HTTPInput::do_work() continue; } if (nfds == -1) { - perror("poll"); + log_perror("poll"); state = CLOSING_SOCKET; } } @@ -215,11 +233,13 @@ void HTTPInput::do_work() request.clear(); 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; } } @@ -229,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; @@ -247,7 +267,7 @@ void HTTPInput::do_work() } while (ret == -1 && errno == EINTR); if (ret == -1) { - perror("write"); + log_perror("write"); state = CLOSING_SOCKET; continue; } @@ -269,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; } @@ -284,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) { @@ -323,14 +344,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; } @@ -345,7 +367,7 @@ void HTTPInput::do_work() } while (err == -1 && errno == EINTR); if (err == -1) { - perror("close"); + log_perror("close"); } state = NOT_CONNECTED; @@ -359,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) { - fprintf(stderr, "Waiting 0.2 second and restarting...\n"); + log(INFO, "[%s] Waiting 0.2 second and restarting...", stream_id.c_str()); usleep(200000); } } @@ -433,8 +455,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); }