summaryrefslogtreecommitdiff
path: root/src/components/media_manager/src/socket_streamer_adapter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/media_manager/src/socket_streamer_adapter.cc')
-rw-r--r--src/components/media_manager/src/socket_streamer_adapter.cc29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc
index 624e388a0c..2f10a29c7d 100644
--- a/src/components/media_manager/src/socket_streamer_adapter.cc
+++ b/src/components/media_manager/src/socket_streamer_adapter.cc
@@ -42,7 +42,7 @@
namespace media_manager {
-CREATE_LOGGERPTR_GLOBAL(logger, "SocketStreamerAdapter")
+SDL_CREATE_LOG_VARIABLE("SocketStreamerAdapter")
SocketStreamerAdapter::SocketStreamerAdapter(const std::string& ip,
const uint16_t port,
@@ -67,17 +67,17 @@ SocketStreamerAdapter::SocketStreamer::SocketStreamer(
SocketStreamerAdapter::SocketStreamer::~SocketStreamer() {}
bool SocketStreamerAdapter::SocketStreamer::Connect() {
- LOG4CXX_AUTO_TRACE(logger);
+ SDL_LOG_AUTO_TRACE();
socket_fd_ = socket(AF_INET, SOCK_STREAM, 0);
if (0 >= socket_fd_) {
- LOG4CXX_ERROR(logger, "Unable to create socket");
+ SDL_LOG_ERROR("Unable to create socket");
return false;
}
int32_t optval = 1;
if (-1 == setsockopt(
socket_fd_, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval)) {
- LOG4CXX_ERROR(logger, "Unable to set sockopt");
+ SDL_LOG_ERROR("Unable to set sockopt");
return false;
}
@@ -88,23 +88,23 @@ bool SocketStreamerAdapter::SocketStreamer::Connect() {
if (-1 == bind(socket_fd_,
reinterpret_cast<struct sockaddr*>(&serv_addr_),
sizeof(serv_addr_))) {
- LOG4CXX_ERROR(logger, "Unable to bind");
+ SDL_LOG_ERROR("Unable to bind");
return false;
}
if (-1 == listen(socket_fd_, 5)) {
- LOG4CXX_ERROR(logger, "Unable to listen");
+ SDL_LOG_ERROR("Unable to listen");
return false;
}
send_socket_fd_ = accept(socket_fd_, NULL, NULL);
if (0 >= send_socket_fd_) {
- LOG4CXX_ERROR(logger, "Unable to accept");
+ SDL_LOG_ERROR("Unable to accept");
return false;
}
is_first_frame_ = true;
- LOG4CXX_INFO(logger, "Client connected: " << send_socket_fd_);
+ SDL_LOG_INFO("Client connected: " << send_socket_fd_);
return true;
}
@@ -113,7 +113,7 @@ void SocketStreamerAdapter::SocketStreamer::Close() {
}
void SocketStreamerAdapter::SocketStreamer::Disconnect() {
- LOG4CXX_AUTO_TRACE(logger);
+ SDL_LOG_AUTO_TRACE();
if (0 < send_socket_fd_) {
shutdown(send_socket_fd_, SHUT_RDWR);
close(send_socket_fd_);
@@ -128,12 +128,12 @@ void SocketStreamerAdapter::SocketStreamer::Disconnect() {
bool SocketStreamerAdapter::SocketStreamer::Send(
protocol_handler::RawMessagePtr msg) {
- LOG4CXX_AUTO_TRACE(logger);
+ SDL_LOG_AUTO_TRACE();
ssize_t ret;
if (is_first_frame_) {
ret = send(send_socket_fd_, header_.c_str(), header_.size(), MSG_NOSIGNAL);
if (static_cast<uint32_t>(ret) != header_.size()) {
- LOG4CXX_ERROR(logger, "Unable to send data to socket");
+ SDL_LOG_ERROR("Unable to send data to socket");
return false;
}
is_first_frame_ = false;
@@ -141,16 +141,15 @@ bool SocketStreamerAdapter::SocketStreamer::Send(
ret = send(send_socket_fd_, msg->data(), msg->data_size(), MSG_NOSIGNAL);
if (-1 == ret) {
- LOG4CXX_ERROR(logger, "Unable to send data to socket");
+ SDL_LOG_ERROR("Unable to send data to socket");
return false;
}
if (static_cast<uint32_t>(ret) != msg->data_size()) {
- LOG4CXX_WARN(logger,
- "Couldn't send all the data to socket " << send_socket_fd_);
+ SDL_LOG_WARN("Couldn't send all the data to socket " << send_socket_fd_);
}
- LOG4CXX_INFO(logger, "Streamer::sent " << msg->data_size());
+ SDL_LOG_INFO("Streamer::sent " << msg->data_size());
return true;
}