Drop NO_LEVEL; it does not look very pretty now.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 1e607d4efc50ebbb9ed3936f4990e6b07d14c30c..f6a99792afafea4da0bd7fe960808a376327b6e1 100644 (file)
--- 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"
@@ -61,7 +62,7 @@ void HTTPInput::close_socket()
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1) {
-               perror("close()");
+               log_perror("close()");
        }
 }
 
@@ -86,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;
        }
@@ -114,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.
                }
 
@@ -122,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;
 }
@@ -132,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;
        }
 
@@ -154,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;
                }
 
@@ -222,7 +223,7 @@ void HTTPInput::do_work()
                                continue;
                        }
                        if (nfds == -1) {
-                               perror("poll");
+                               log_perror("poll");
                                state = CLOSING_SOCKET;
                        }
                }
@@ -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, "[%s] Failed to parse URL '%s'", stream_id.c_str(), url.c_str());
                                        break;
                                }
                        }
@@ -248,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;
@@ -266,7 +267,7 @@ void HTTPInput::do_work()
                        } while (ret == -1 && errno == EINTR);
 
                        if (ret == -1) {
-                               perror("write");
+                               log_perror("write");
                                state = CLOSING_SOCKET;
                                continue;
                        }
@@ -288,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;
                        }
@@ -303,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) {
@@ -330,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;
                }
@@ -342,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;
                        }
@@ -364,7 +369,7 @@ void HTTPInput::do_work()
                        } while (err == -1 && errno == EINTR);
 
                        if (err == -1) {
-                               perror("close");
+                               log_perror("close");
                        }
 
                        state = NOT_CONNECTED;
@@ -378,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);
                }
        }
@@ -452,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);
 }