From ec12b702a002ec0989437cede78ef49e67fa6f52 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 17 Jul 2020 16:41:56 +0100
Subject: [PATCH] Allow configuring the search log level in the Python
 generator.

---
 e2e-test/python-generator/generator.py                      | 3 +++
 .../python-generator/templates/search/Dockerfile.template   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/e2e-test/python-generator/generator.py b/e2e-test/python-generator/generator.py
index 99cf11d68..d541831c8 100644
--- a/e2e-test/python-generator/generator.py
+++ b/e2e-test/python-generator/generator.py
@@ -220,6 +220,8 @@ if __name__ == '__main__':
     parser.add_argument('-sc', '--shardCount', type=int, help='Total number of shards to create (default 2)')
     parser.add_argument('-sr', '--shardRange', type=int, help='Total number of nodes per shard with DB_ID_RANGE sharding (default 800)')
     parser.add_argument('-ct', '--disableCascadeTracking', action='store_true', help='Cascade Tracking Disabled')
+    parser.add_argument('-sl', '--searchLogLevel', default='WARN', help='The log level for search (default WARN)',
+                        choices=['TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR'])
     parser.add_argument('-o', '--output', default='.', help='The path of the directory to output to')
     parser.add_argument('-mtls', '--mtls', action='store_true', help='Use mTLS between SOLR and Alfresco Repository')
     args = parser.parse_args()
@@ -251,6 +253,7 @@ if __name__ == '__main__':
             'SHARE_IMAGE': args.share,
             'POSTGRES_IMAGE': args.postgres,
             'SEARCH_IMAGE': args.search,
+            'SEARCH_LOG_LEVEL': args.searchLogLevel,
             'SEARCH_ENABLE_SPELLCHECK': str(args.spellcheck).lower(),
             'DISABLE_CASCADE_TRACKING': str(args.disableCascadeTracking).lower()
             }
diff --git a/e2e-test/python-generator/templates/search/Dockerfile.template b/e2e-test/python-generator/templates/search/Dockerfile.template
index 70d97b9a7..cd2db8ae2 100644
--- a/e2e-test/python-generator/templates/search/Dockerfile.template
+++ b/e2e-test/python-generator/templates/search/Dockerfile.template
@@ -23,4 +23,10 @@ RUN mkdir -p /opt/alfresco-search-services/keystore \
     && chown -R solr:solr /opt/alfresco-search-services/keystore
 USER solr
 
+# Set the search log level if requested.
+RUN if [ "${SEARCH_LOG_LEVEL}" != "" ] ; then \
+  sed -i '/^bash.*/i sed -i "'"s/log4j.rootLogger=WARN, file, CONSOLE/log4j.rootLogger=${SEARCH_LOG_LEVEL}, file, CONSOLE/g"'" $${DIST_DIR}/logs/log4j.properties\n' \
+  $${DIST_DIR}/solr/bin/search_config_setup.sh; \
+fi
+
 VOLUME ["/opt/alfresco-search-services/keystore"]