From e1ab8b875c10edea51f6ffa66999964e38a5e4dc Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Fri, 9 Mar 2018 09:57:51 +0100
Subject: [PATCH] [cta-admin] Sets log level from environment variables
---
cmdline/CtaAdminCmd.cpp | 13 ++++++++++---
xrootd-ssi-protobuf-interface | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index 30b8b780a1..ef6cc80572 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -153,9 +153,16 @@ void CtaAdminCmd::send() const
// Set configuration options
XrdSsiPb::Config config;
- config.set("response_bufsize", StreamBufferSize);
- config.set("request_timeout", DefaultRequestTimeout);
- config.getEnv("request_timeout", "XRD_REQUESTTIMEOUT");
+ config.set("response_bufsize", StreamBufferSize); // default value = 1024 bytes
+ config.set("request_timeout", DefaultRequestTimeout); // default value = 10s
+ config.getEnv("request_timeout", "XRD_REQUESTTIMEOUT"); // environment variable can override default
+
+ // If XRDDEBUG=1, switch on all logging
+ if(getenv("XRDDEBUG")) {
+ config.set("log", "all");
+ }
+ // If fine-grained control over log level is required, use XrdSsiPbLogLevel
+ config.getEnv("log", "XrdSsiPbLogLevel");
// Obtain a Service Provider
XrdSsiPbServiceType cta_service(endpoint, Resource, config);
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index abdb133901..d37262d05c 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit abdb133901fb9451a27e941910a5a2228117ce99
+Subproject commit d37262d05c46e8d420f3b38b7b929a36a6056b9f
--
GitLab