From 7498d41fe73eb26622bb15d7952e9b692747f090 Mon Sep 17 00:00:00 2001
From: John Gates <jgates@slac.stanford.edu>
Date: Tue, 6 Jul 2021 16:30:14 -0700
Subject: [PATCH] Logging changes for xrootd testing.

---
 admin/templates/configuration/etc/log4cxx.czar.properties   | 5 +++--
 admin/templates/configuration/etc/log4cxx.worker.properties | 5 +++--
 admin/templates/configuration/etc/lsp.cf                    | 1 +
 admin/templates/configuration/etc/sysconfig/qserv           | 4 ++--
 core/modules/ccontrol/UserQueryFactory.cc                   | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/admin/templates/configuration/etc/log4cxx.czar.properties b/admin/templates/configuration/etc/log4cxx.czar.properties
index 94644a008c..2fe482ed63 100644
--- a/admin/templates/configuration/etc/log4cxx.czar.properties
+++ b/admin/templates/configuration/etc/log4cxx.czar.properties
@@ -3,7 +3,8 @@
 # used by Qserv-czar
 #
 
-log4j.rootLogger=INFO, CONSOLE
+#log4j.rootLogger=INFO, CONSOLE //&&&
+log4j.rootLogger=ERROR, CONSOLE
 
 # Use this appender to interlace xrootd debug messages with Qserv-czar standard
 # logs. stdout/stderr are redirected to {{QSERV_LOG_DIR}}/qserv-czar-console.log.
@@ -27,5 +28,5 @@ log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-ddTHH:mm:ss.SSSZ} %X %-5
 #log4j.logger.lsst.qserv.util=DEBUG
 #log4j.logger.lsst.qserv.qana=DEBUG
 #log4j.logger.lsst.qserv.xrdssi.msgs=WARN //&&&
-log4j.logger.lsst.qserv.xrdssi.msgs=DEBUG
+log4j.logger.lsst.qserv.xrdssi.msgs=ERROR
 
diff --git a/admin/templates/configuration/etc/log4cxx.worker.properties b/admin/templates/configuration/etc/log4cxx.worker.properties
index ec708b4889..e26c262cbd 100644
--- a/admin/templates/configuration/etc/log4cxx.worker.properties
+++ b/admin/templates/configuration/etc/log4cxx.worker.properties
@@ -2,7 +2,8 @@
 # Configuration file for log4cxx
 #
 
-log4j.rootLogger=DEBUG, CONSOLE
+#log4j.rootLogger=DEBUG, CONSOLE //&&&
+log4j.rootLogger=ERROR, CONSOLE 
 
 # Appender for xrootd log file
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
@@ -10,4 +11,4 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy-MM-ddTHH:mm:ss.SSSZ}] %X %-5p %c{2} (%F:%L) - %m%n
 
 #log4j.logger.lsst.qserv.xrdssi.msgs=WARN &&&
-log4j.logger.lsst.qserv.xrdssi.msgs=DEBUG
+log4j.logger.lsst.qserv.xrdssi.msgs=ERROR
diff --git a/admin/templates/configuration/etc/lsp.cf b/admin/templates/configuration/etc/lsp.cf
index 4fe6c3a72e..b617af2250 100644
--- a/admin/templates/configuration/etc/lsp.cf
+++ b/admin/templates/configuration/etc/lsp.cf
@@ -77,6 +77,7 @@ xrd.port {{XROOTD_PORT}}
 
 # Uncomment the following line for detailed xrootd debugging
 # xrootd.trace all debug
+xrootd.trace fs request response
 
 # Set limits for the number of threads open by XRootD services
 # See more details on these parameters at:
diff --git a/admin/templates/configuration/etc/sysconfig/qserv b/admin/templates/configuration/etc/sysconfig/qserv
index 59e91fdba5..a8425f2878 100644
--- a/admin/templates/configuration/etc/sysconfig/qserv
+++ b/admin/templates/configuration/etc/sysconfig/qserv
@@ -53,8 +53,8 @@ ulimit -c unlimited
 export PYTHONUNBUFFERED=1
 
 export XRD_LOGLEVEL=Debug
-unset XRDSSIDEBUG
-#export XRDSSIDEBUG=0
+#unset XRDSSIDEBUG
+export XRDSSIDEBUG=1
 
 # Increase timeouts, without that, long-running queries fail.
 # The proper fix is coming, see DM-3433
diff --git a/core/modules/ccontrol/UserQueryFactory.cc b/core/modules/ccontrol/UserQueryFactory.cc
index a54822c4a2..88fe219733 100644
--- a/core/modules/ccontrol/UserQueryFactory.cc
+++ b/core/modules/ccontrol/UserQueryFactory.cc
@@ -101,7 +101,7 @@ UserQueryFactory::UserQueryFactory(czar::CzarConfig const& czarConfig,
                                    std::string const& czarName)
         :  _userQuerySharedResources(makeUserQuerySharedResources(czarConfig, dbModels, czarName)) {
 
-    ::putenv((char*)"XRDDEBUG=1");
+    //&&& ::putenv((char*)"XRDDEBUG=1");
 
     _executiveConfig = std::make_shared<qdisp::ExecutiveConfig>(
             czarConfig.getXrootdFrontendUrl(), czarConfig.getQMetaSecondsBetweenChunkUpdates());