Merge "Logging improvements"

4 files changed, 85 insertions, 5 deletions

diff --git a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml b/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml
index bbc58cf2f..8d92ffebc 100755
--- a/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml
+++ b/deliveries/src/main/docker/docker-files/conf.d/logback_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
+<configuration scan="true" scanPeriod="3 seconds">
   <!--  specify the component name -->
   <property name="componentName" value="vid"></property>
   
@@ -332,8 +332,15 @@
    <logger name="com.att.eelf.debug" level="debug" additivity="false">
         <appender-ref ref="asyncEELFDebug" />
   </logger>
-  
-    
+
+  <logger name="org.hibernate" level="WARN" additivity="false">
+    <appender-ref ref="asyncEELF"/>
+  </logger>
+
+  <logger name="org.hibernate.SQL" level="DEBUG" additivity="false">
+    <appender-ref ref="asyncEELFDebug"/>
+  </logger>
+
   <root level="${VID_LOG_LEVEL}">
     <appender-ref ref="asyncEELF" />
   </root>
diff --git a/deliveries/src/main/docker/docker-files/logging.properties b/deliveries/src/main/docker/docker-files/logging.properties
new file mode 100644
index 000000000..cab99b761
--- /dev/null
+++ b/deliveries/src/main/docker/docker-files/logging.properties
@@ -0,0 +1,71 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+
+4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# Log less important stuff to file only
+org.apache.catalina.core.handlers = 1catalina.org.apache.juli.AsyncFileHandler
+org.apache.catalina.startup.HostConfig.handlers = 1catalina.org.apache.juli.AsyncFileHandler
+org.apache.coyote.handlers = 1catalina.org.apache.juli.AsyncFileHandler
+org.apache.catalina.startup.VersionLoggerListener.handlers = 1catalina.org.apache.juli.AsyncFileHandler
+org.apache.jasper.servlet.TldScanner.handlers = 1catalina.org.apache.juli.AsyncFileHandler
\ No newline at end of file
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 049ebf0dd..dba844112 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -71,7 +71,8 @@ db.password = euser
 db.min_pool_size = 5

 db.max_pool_size = 10

 hb.dialect = org.hibernate.dialect.MySQLDialect

-hb.show_sql = true

+

+hb.show_sql = false     # this property is set in logger configuration to keep console output clean

 hb.idle_connection_test_period = 3600

 app_display_name					  = VID

 files_path = /tmp

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
index 149ad99ed..6b5b37c91 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
@@ -27,7 +27,8 @@ db.hib.dialect = org.hibernate.dialect.MySQLDialect
 db.min_pool_size = 5

 db.max_pool_size = 10

 hb.dialect = org.hibernate.dialect.MySQLDialect

-hb.show_sql = true

+

+hb.show_sql = false     # this property is set in logger configuration to keep console output clean

 hb.idle_connection_test_period = 3600

 app_display_name = ${VID_APP_DISPLAY_NAME}

 files_path = /tmp