added .gitignore and started converting to use libplp for debug

[libplpbus.git] / src / plpbus / OrbServerImpl.cc

diff --git a/src/plpbus/OrbServerImpl.cc b/src/plpbus/OrbServerImpl.cc
index d12846e206c7f4b27637915c20a1b04696b5b9b2..fc0eeccae73f6ea6e30e21d4e595d430ab0010f3 100644 (file)
--- a/src/plpbus/OrbServerImpl.cc
+++ b/src/plpbus/OrbServerImpl.cc
@@ -5,6 +5,8 @@
  *      Author: lamikr
  */
 
+#include <plp/log.h>
+
 #include "ServerEventThread.hh"
 #include "OrbServerImpl.hh"
 #include "ClientServerCommon.hh"
@@ -28,7 +30,7 @@ OrbServerImpl::OrbServerImpl()
 
 OrbServerImpl::~OrbServerImpl()
 {
-       cout << "OrbServerImpl destroyed." << endl;
+       log_info("OrbServerImpl destroyed.\n");
 }
 
 void OrbServerImpl::send_message_and_request_response(OrbClient_ptr response_listener_param,
@@ -39,16 +41,16 @@ void OrbServerImpl::send_message_and_request_response(OrbClient_ptr response_lis
        msg_rsp = NULL;
        if (CORBA::is_nil(response_listener_param) == false) {
                if (_listener != NULL) {
-                       cout << "send_message_and_request_response(): " << msg_req << ", server_callback != NULL" << endl;
+                       log_debug("send_message_and_request_response(): %s, server callback != NULL\n", msg_req);
                        _listener->request_received(msg_req, &msg_rsp);
                        response_listener_param->receive_response_message(msg_rsp);
                }
                else {
-                       cout << "send_message_and_request_response() error! " << msg_req << ", server_callback == NULL" << endl;
+                       log_error("send_message_and_request_response() error, server callback == NULL\n");
                }
        }
        else {
-               cerr << "invalid callback object received.\n";
+               log_error("invalid callback object received.\n");
        }
 }
 
@@ -59,11 +61,11 @@ char *OrbServerImpl::send_message_and_wait_response(const char* msg_req_param, :
        err_flg = 0;
        msg_rsp = NULL;
        if (_listener != NULL) {
-               cout << "send_message_and_wait_response(): " << msg_req_param << ", server_callback != NULL" << endl;
+               log_debug("send_message_and_wait_response(): %s, server_callback != NULL\n", msg_req_param);
                _listener->request_received(msg_req_param, &msg_rsp);
        }
        else {
-               cout << "send_message_and_wait_response() error! " << msg_req_param << ", server_callback == NULL" << endl;
+               log_error("send_message_and_wait_response() error, server callback == NULL\n");
                msg_rsp = strdup(msg_req_param);
                err_flg = -1;
        }
@@ -79,17 +81,17 @@ void OrbServerImpl::send_dataitem_message_and_request_response(OrbClient_ptr res
        if (CORBA::is_nil(response_listener_param) == false) {
                if (_listener != NULL) {
                        msg_req = new BusMessageInternal(msg_req_param);
-                       cout << "send_dataitem_message_and_request_response(), server_callback != NULL" << endl;
-                       cout << "msg_req:" << endl;
+                       log_debug("send_dataitem_message_and_request_response(), server_callback != NULL\n");
+                       log_debug("msg_req:\n");
                        msg_req->printout();
                        msg_rsp = NULL;
                        _listener->request_received(msg_req, &msg_rsp);
-                       cout << "msg_rsp length:" << msg_rsp->_dataItemSeq.length() << endl;
+                       log_debug("msg_rsp length: %d\n", msg_rsp->_dataItemSeq.length());
                        msg_rsp->printout();
                        response_listener_param->receive_response_dataitem_sequence(msg_rsp->_dataItemSeq);
                }
                else {
-                       cout << "send_dataitem_message_and_request_response() error, server_callback == NULL" << endl;
+                       log_error("send_dataitem_message_and_request_response() error, server_callback == NULL\n");
                }
        }
 }
@@ -115,7 +117,7 @@ void OrbServerImpl::add_event_listener(OrbClient_ptr client_param,
        ServerEventThread       *srvr_thread;
 
        if (CORBA::is_nil(client_param) == false) {
-               cout << "add_event_listener()" << endl;
+               log_debug("add_event_listener()\n");
                server_thread_mutex.lock();
                _server_thread_count++;
                server_thread_mutex.unlock();