Fix verbosity checks on deserialization.

diff --git a/httpinput.cpp b/httpinput.cpp
index 49333c5f4357c48fa00184c6822931b95759d4b6..a45a4ba00e2ef99031beddd7c449719174c4dd15 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -76,7 +76,9 @@ HTTPInput::HTTPInput(const InputProto &serialized)
          http_header(serialized.http_header()),
          stream_header(serialized.stream_header()),
          has_metacube_header(serialized.has_metacube_header()),
          http_header(serialized.http_header()),
          stream_header(serialized.stream_header()),
          has_metacube_header(serialized.has_metacube_header()),

-         sock(serialized.sock())
+         sock(serialized.sock()),
+         num_connection_attempts(0),
+         suppress_logging(false)

 {
        pending_data.resize(serialized.pending_data().size());
        memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 {
        pending_data.resize(serialized.pending_data().size());
        memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());


@@ -93,6 +95,9 @@ HTTPInput::HTTPInput(const InputProto &serialized)
        } else {
                stats.connect_time = time(NULL);
        }
        } else {
                stats.connect_time = time(NULL);
        }

+
+       last_verbose_connection.tv_sec = -3600;
+       last_verbose_connection.tv_nsec = 0;

 }
 
 void HTTPInput::close_socket()
 }
 
 void HTTPInput::close_socket()

diff --git a/input.cpp b/input.cpp
index 25012a6bbad930f63a53914ed53fd0e9d8cc4fcf..7f95b2693a96ea0e56f858eb484c68e8f7a84031 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -104,9 +104,7 @@ Input *create_input(const string &url, Input::Encoding encoding)
                return new HTTPInput(url, encoding);
        }
        if (protocol == "udp") {
                return new HTTPInput(url, encoding);
        }
        if (protocol == "udp") {

-               if (encoding == Input::INPUT_ENCODING_METACUBE) {
-                       return NULL;
-               }
+               // encoding is ignored; it's never Metacube.

                return new UDPInput(url);
        }
        return NULL;
                return new UDPInput(url);
        }
        return NULL;