diff --git a/server/server.cpp b/server/server.cpp index 2fe49489..65a6b2e5 100644 --- a/server/server.cpp +++ b/server/server.cpp @@ -44,7 +44,7 @@ Server::~Server() = default; void Server::onNewSession(const std::shared_ptr& session) { - LOG(INFO, LOG_TAG) << "onNewSession\n"; + LOG(DEBUG, LOG_TAG) << "onNewSession\n"; streamServer_->addSession(session); } @@ -57,7 +57,7 @@ void Server::onMetaChanged(const PcmStream* pcmStream) const auto meta = pcmStream->getMeta(); LOG(DEBUG, LOG_TAG) << "metadata = " << meta->msg.dump(3) << "\n"; - LOG(INFO, LOG_TAG) << "onMetaChanged (" << pcmStream->getName() << ")\n"; + LOG(DEBUG, LOG_TAG) << "onMetaChanged (" << pcmStream->getName() << ")\n"; streamServer_->onMetaChanged(pcmStream, meta); @@ -70,7 +70,7 @@ void Server::onMetaChanged(const PcmStream* pcmStream) void Server::onPropertiesChanged(const PcmStream* pcmStream) { - LOG(INFO, LOG_TAG) << "onPropertiesChanged (" << pcmStream->getName() << ")\n"; + LOG(DEBUG, LOG_TAG) << "onPropertiesChanged (" << pcmStream->getName() << ")\n"; const auto props = pcmStream->getProperties(); // Send propeties to all connected control clients diff --git a/server/streamreader/pcm_stream.cpp b/server/streamreader/pcm_stream.cpp index 7f3b966e..d0f25520 100644 --- a/server/streamreader/pcm_stream.cpp +++ b/server/streamreader/pcm_stream.cpp @@ -82,11 +82,10 @@ void CtrlScript::send(const std::string& msg) void CtrlScript::logScript(std::string line) { - if (line.empty()) - return; - if (line.back() == '\r') line.resize(line.size() - 1); + if (line.empty()) + return; auto tmp = utils::string::tolower_copy(line); AixLog::Severity severity = AixLog::Severity::info; if (tmp.find(" trace") != string::npos) @@ -381,6 +380,8 @@ json PcmStream::toJson() const if (meta_) j["meta"] = meta_->msg; + if (properties_) + j["properties"] = properties_->toJson(); return j; }