From 1df896d6d1d4bf6300753c46306e2f70ca7d8246 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sun, 8 Jun 2014 00:37:50 +0200 Subject: [PATCH] Tweaks to various debug messages. --- lib/json.cpp | 2 +- lib/socket.cpp | 2 +- lib/stream.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/json.cpp b/lib/json.cpp index e44c7234..190dce70 100644 --- a/lib/json.cpp +++ b/lib/json.cpp @@ -732,7 +732,7 @@ std::string & JSON::Value::toNetPacked(){ static std::string emptystring; //check if this is legal if (myType != OBJECT){ - DEBUG_MSG(DLVL_ERROR, "Only objects may be netpacked!"); + INFO_MSG("Ignored attempt to netpack a non-object."); return emptystring; } //if sneaky storage doesn't contain correct data, re-calculate it diff --git a/lib/socket.cpp b/lib/socket.cpp index 6be58ad4..51687220 100644 --- a/lib/socket.cpp +++ b/lib/socket.cpp @@ -541,7 +541,7 @@ unsigned int Socket::Connection::iwrite(const void * buffer, int len){ return 0; break; default: - if (errno != EPIPE){ + if (errno != EPIPE && errno != ECONNRESET){ Error = true; remotehost = strerror(errno); DEBUG_MSG(DLVL_WARN, "Could not iwrite data! Error: %s", remotehost.c_str()); diff --git a/lib/stream.cpp b/lib/stream.cpp index eb22e140..7de2b657 100644 --- a/lib/stream.cpp +++ b/lib/stream.cpp @@ -101,7 +101,7 @@ bool Util::Stream::getVod(std::string filename, std::string streamname){ name.str("MistInFLV " + filename); player_bin = Util::getMyPath() + "MistInFLV"; } - DEBUG_MSG(DLVL_WARN, "Starting %s -p -s %s %s", player_bin.c_str(), streamname.c_str(), filename.c_str()); + INFO_MSG("Starting %s -p -s %s %s", player_bin.c_str(), streamname.c_str(), filename.c_str()); char* const argv[] = {(char*)player_bin.c_str(), (char*)"-p", (char*)"-s", (char*)streamname.c_str(), (char*)filename.c_str(), (char*)0}; int pid = fork();