diff options
Diffstat (limited to 'src/components/telemetry_monitor/src/telemetry_monitor.cc')
| -rw-r--r-- | src/components/telemetry_monitor/src/telemetry_monitor.cc | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc index 427ecada76..b1bb605de3 100644 --- a/src/components/telemetry_monitor/src/telemetry_monitor.cc +++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc @@ -47,7 +47,7 @@ namespace telemetry_monitor { -CREATE_LOGGERPTR_GLOBAL(logger_, "TelemetryMonitor") +SDL_CREATE_LOG_VARIABLE("TelemetryMonitor") TelemetryMonitor::TelemetryMonitor(const std::string& server_address, uint16_t port) @@ -64,12 +64,12 @@ void TelemetryMonitor::Start() { } void TelemetryMonitor::set_streamer(std::shared_ptr<Streamer> streamer) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (thread_ && !thread_->IsRunning()) { thread_->SetDelegate(streamer_.get()); streamer_ = streamer; } else { - LOG4CXX_ERROR(logger_, "Unable to replace streamer if it is active"); + SDL_LOG_ERROR("Unable to replace streamer if it is active"); } } @@ -91,7 +91,7 @@ void TelemetryMonitor::Init( TelemetryObservable<application_manager::AMTelemetryObserver>* app_manager, TelemetryObservable<transport_manager::TMTelemetryObserver>* transport_manager) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); DCHECK_OR_RETURN_VOID(streamer_); app_manager->SetTelemetryObserver(&app_observer); @@ -103,7 +103,7 @@ void TelemetryMonitor::Init( } void TelemetryMonitor::Stop() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (thread_) { thread_->Stop(threads::Thread::kThreadSoftStop); if (thread_->GetDelegate()) { @@ -132,18 +132,18 @@ Streamer::~Streamer() { } void Streamer::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); Start(); while (!stop_flag_) { - LOG4CXX_INFO(logger_, "Server socket is listening "); + SDL_LOG_INFO("Server socket is listening "); client_socket_fd_ = accept(server_socket_fd_, NULL, NULL); if (0 > client_socket_fd_) { - LOG4CXX_ERROR(logger_, "Cant open socket . Socket is busy "); + SDL_LOG_ERROR("Cant open socket . Socket is busy "); Stop(); break; } - LOG4CXX_INFO(logger_, "Client connected"); + SDL_LOG_INFO("Client connected"); is_client_connected_ = true; while (is_client_connected_) { @@ -156,7 +156,7 @@ void Streamer::threadMain() { } if (!IsReady()) { - LOG4CXX_INFO(logger_, "Client disconnected."); + SDL_LOG_INFO("Client disconnected."); break; } @@ -166,21 +166,21 @@ void Streamer::threadMain() { } void Streamer::exitThreadMain() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); Stop(); messages_.Shutdown(); ThreadDelegate::exitThreadMain(); } void Streamer::Start() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); server_socket_fd_ = socket(AF_INET, SOCK_STREAM, 0); if (0 >= server_socket_fd_) { - LOG4CXX_ERROR(logger_, "Server open error"); + SDL_LOG_ERROR("Server open error"); return; } else { - LOG4CXX_DEBUG(logger_, "Server socket : " << server_socket_fd_); + SDL_LOG_DEBUG("Server socket : " << server_socket_fd_); } int32_t optval = 1; @@ -189,7 +189,7 @@ void Streamer::Start() { SO_REUSEADDR, &optval, sizeof optval)) { - LOG4CXX_ERROR(logger_, "Unable to set sockopt"); + SDL_LOG_ERROR("Unable to set sockopt"); return; } @@ -201,45 +201,44 @@ void Streamer::Start() { if (-1 == bind(server_socket_fd_, reinterpret_cast<struct sockaddr*>(&serv_addr_), sizeof(serv_addr_))) { - LOG4CXX_ERROR(logger_, - "Unable to bind server " << kserver_->ip().c_str() << ':' + SDL_LOG_ERROR("Unable to bind server " << kserver_->ip().c_str() << ':' << kserver_->port()); return; } if (-1 == listen(server_socket_fd_, 1)) { - LOG4CXX_ERROR(logger_, "Streamer listen error " << strerror(errno)); + SDL_LOG_ERROR("Streamer listen error " << strerror(errno)); return; } } void Streamer::ShutDownAndCloseSocket(int32_t socket_fd) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (0 < socket_fd) { - LOG4CXX_INFO(logger_, "Shutdown socket"); + SDL_LOG_INFO("Shutdown socket"); if (-1 == ::shutdown(socket_fd, SHUT_RDWR)) { - LOG4CXX_ERROR(logger_, "Unable to shutdown socket"); + SDL_LOG_ERROR("Unable to shutdown socket"); } if (-1 == close(socket_fd)) { - LOG4CXX_ERROR(logger_, "Unable to close socket"); + SDL_LOG_ERROR("Unable to close socket"); } } else { - LOG4CXX_WARN(logger_, "Socket in not connected: " << socket_fd); + SDL_LOG_WARN("Socket in not connected: " << socket_fd); } } void Streamer::Stop() { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (stop_flag_) { - LOG4CXX_WARN(logger_, "Already Stopped"); + SDL_LOG_WARN("Already Stopped"); return; } stop_flag_ = true; messages_.Reset(); - LOG4CXX_WARN(logger_, "Stop server_socket_fd_"); + SDL_LOG_WARN("Stop server_socket_fd_"); ShutDownAndCloseSocket(server_socket_fd_); server_socket_fd_ = -1; - LOG4CXX_WARN(logger_, "Stop client_socket_fd_"); + SDL_LOG_WARN("Stop client_socket_fd_"); ShutDownAndCloseSocket(client_socket_fd_); client_socket_fd_ = -1; is_client_connected_ = false; @@ -258,10 +257,10 @@ bool Streamer::IsReady() const { const int retval = select(client_socket_fd_ + 1, 0, &fds, 0, &tv); if (-1 == retval) { - LOG4CXX_ERROR(logger_, "An error occurred"); + SDL_LOG_ERROR("An error occurred"); result = false; } else if (0 == retval) { - LOG4CXX_ERROR(logger_, "The timeout expired"); + SDL_LOG_ERROR("The timeout expired"); result = false; } @@ -269,14 +268,14 @@ bool Streamer::IsReady() const { } bool Streamer::Send(const std::string& msg) { - LOG4CXX_AUTO_TRACE(logger_); + SDL_LOG_AUTO_TRACE(); if (!IsReady()) { - LOG4CXX_ERROR(logger_, " Socket is not ready"); + SDL_LOG_ERROR(" Socket is not ready"); return false; } if (-1 == ::send(client_socket_fd_, msg.c_str(), msg.size(), MSG_NOSIGNAL)) { - LOG4CXX_ERROR(logger_, " Unable to send"); + SDL_LOG_ERROR(" Unable to send"); return false; } return true; |