Allow configuring the search log level.

e2e-test/generator-alfresco-docker-compose/generators/app/index.js

@@ -102,6 +102,19 @@ module.exports = class extends Generator {
          ],
         default: 'DB_ID'
       },
+      {
+        type: 'list',
+        name: 'searchLogLevel',
+        message: 'What log level do you want to use for search?',
+        choices: [
+          "TRACE",
+          "DEBUG",
+          "INFO",
+          "WARN",
+          "ERROR"
+        ],
+        default: 'WARN'
+      },
       {
         whenFunction: response => response.alfrescoVersion == 'enterprise',
         type: 'confirm',
@@ -214,7 +227,8 @@ module.exports = class extends Generator {
         zeppelin: (this.props.zeppelin ? "true" : "false"),
         sharding: (this.props.sharding ? "true" : "false"),
         shardingMethod: (this.props.shardingMethod),
-        gzip: (this.props.gzip ? "true" : "false")
+        gzip: (this.props.gzip ? "true" : "false"),
+        searchLogLevel: this.props.searchLogLevel
       }
     );
 

e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml

@@ -50,6 +50,7 @@ services:
             KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
             ENABLE_MASTER: "true"
             ENABLE_SLAVE: "false" <% } %>
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco
@@ -183,4 +184,4 @@ services:
             - alfresco
             - share
             - solr6
-            - content-app
+            - content-app

e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml

@@ -69,6 +69,7 @@ services:
             SHARD_KEY: "shard:shardId" <% } %> <% if (shardingMethod == 'EXPLICIT_ID' || shardingMethod == 'EXPLICIT_ID_FALLBACK_LRIS') { %>
             SHARD_KEY: "shard:shardId" <% } %>
             SHARDING_METHOD: <%=shardingMethod%> <% } %>
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco
@@ -331,4 +332,4 @@ volumes:
     shared-file-store-volume:
         driver_opts:
             type: tmpfs
-            device: tmpfs
+            device: tmpfs

e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml

@@ -68,6 +68,7 @@ services:
             ENABLE_MASTER: "true"
             ENABLE_SLAVE: "false" <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco
@@ -242,4 +243,4 @@ services:
             - alfresco
             - share
             - solr6
-            - content-app
+            - content-app

e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml

@@ -72,6 +72,7 @@ services:
             SHARD_KEY: "shard:shardId" <% } %>
             SHARDING_METHOD: <%=shardingMethod%> <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco

e2e-test/generator-alfresco-docker-compose/generators/app/templates/images/search/Dockerfile

@@ -152,4 +152,12 @@ fi
 RUN mkdir ${DIST_DIR}/keystore \
     && chown -R solr:solr ${DIST_DIR}/keystore
 
+# Set the search log level if requested.
+ARG SEARCH_LOG_LEVEL
+ENV SEARCH_LOG_LEVEL $SEARCH_LOG_LEVEL
+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 ["${DIST_DIR}/keystore"]

e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ce.yml

@@ -61,6 +61,7 @@ services:
             ENABLE_MASTER: "true"
             ENABLE_SLAVE: "false" <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco
@@ -203,4 +204,4 @@ services:
             - alfresco
             - share
             - solr6
-            - content-app
+            - content-app

e2e-test/generator-alfresco-docker-compose/generators/app/templates/latest/docker-compose-ee.yml

@@ -91,6 +91,7 @@ services:
             SHARD_KEY: "shard:shardId" <% } %>
             SHARDING_METHOD: <%=shardingMethod%> <% } %>
             COMPRESS_CONTENT: "<%=gzip%>"
+            SEARCH_LOG_LEVEL: <%=searchLogLevel%>
         mem_limit: 1200m
         environment:
             #Solr needs to know how to register itself with Alfresco

e2e-test/generator-alfresco-docker-compose/package.json

@@ -21,8 +21,9 @@
     "npm": ">= 4.0.0"
   },
   "dependencies": {
-    "yeoman-generator": "^2.0.1",
     "chalk": "^2.1.0",
+    "yeoman-generator": "^2.0.1",
+    "yo": "^3.1.1",
     "yosay": "^2.0.1"
   },
   "jest": {