From 8a2eac75f0618d9c1d9ea730312a79dd9a48838f Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Mon, 5 Mar 2018 16:36:39 +0100
Subject: [PATCH] [xrd_ssi_pb] Does not log before ServiceClientSide is
 initialised

---
 cmdline/CtaAdminCmd.cpp       | 3 ---
 cmdline/EosCtaStub.cpp        | 8 ++------
 xrootd-ssi-protobuf-interface | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index 60c3718e41..8fac1605b1 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -148,8 +148,6 @@ void CtaAdminCmd::send() const
       throwUsage(ex.what());
    }
 
-   XrdSsiPb::Log::DumpProtobuf(XrdSsiPb::Log::PROTOBUF, &m_request.admincmd());
-
    // Get socket address of CTA Frontend endpoint
 
    cta::cmdline::Configuration cliConf("/etc/cta/cta-cli.conf");
@@ -301,7 +299,6 @@ int CtaAdminCmd::GetRequestTimeout() const
    // Use default if XRD_REQUESTTIMEOUT is not a valid positive integer
    if(request_timeout <= 0) request_timeout = DefaultRequestTimeout;
 
-   XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, "GetRequestTimeout(): Request timeout = ", request_timeout, 's');
    return request_timeout;
 }
 
diff --git a/cmdline/EosCtaStub.cpp b/cmdline/EosCtaStub.cpp
index 9e4f654e43..e849a741c1 100644
--- a/cmdline/EosCtaStub.cpp
+++ b/cmdline/EosCtaStub.cpp
@@ -117,7 +117,7 @@ void base64Decode(cta::eos::Notification &notification, const std::string &argva
       else if(key == "mode") notification.mutable_file()->set_mode(stoi(val));
       else if(key == "file") notification.mutable_file()->set_lpath(val);
       else {
-         XrdSsiPb::Log::Msg(XrdSsiPb::Log::ERROR, "base64Decode", "No match in protobuf for fmd:", key, '=', val);
+         std::cerr << "base64Decode(): No match in protobuf for fmd:" << key << '=' << val << std::endl;
       }
    }
 
@@ -161,7 +161,7 @@ void base64Decode(cta::eos::Notification &notification, const std::string &argva
          notification.mutable_directory()->mutable_xattr()->insert(google::protobuf::MapPair<string,string>(xattrn, val));
       }
       else {
-         XrdSsiPb::Log::Msg(XrdSsiPb::Log::ERROR, "base64Decode", "No match in protobuf for dmd:", key, '=', val);
+         std::cerr << "base64Decode(): No match in protobuf for dmd:" << key << '=' << val << std::endl;
       }
    }
 }
@@ -265,8 +265,6 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
 
    fillNotification(notification, argc, argv);
 
-   XrdSsiPb::Log::DumpProtobuf(XrdSsiPb::Log::PROTOBUF, &notification);
-
    // Get socket address of CTA Frontend endpoint
 
    cta::cmdline::Configuration cliConf("/etc/cta/cta-cli.conf");
@@ -284,8 +282,6 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
   
    cta_service.Send(request, response);
 
-   XrdSsiPb::Log::DumpProtobuf(XrdSsiPb::Log::PROTOBUF, &response);
-
    // Handle responses
 
    switch(response.type())
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index bb95ae8b5a..ded90c7c6d 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit bb95ae8b5acfc8424b6a5537a5738bd92b4dfb2a
+Subproject commit ded90c7c6d000246b846763e4c38b151f1899cea
-- 
GitLab