Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(logging): fix default logging configuration #8289

Merged
merged 1 commit into from
Jul 3, 2020

Conversation

educhastenier
Copy link
Contributor

No description provided.

@github-actions
Copy link

github-actions bot commented Jul 2, 2020

Diff for 4fc6df8:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b0b7782..4c90cd3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,5 +13,5 @@ Directory: 7.10
 
 Tags: 7.11.0, 7.11, latest
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: a7650bb7c128c9b8e8c96eb770950c1bffab9c6d
+GitCommit: 01eb71d7570cf028dd5fa3692ede98903e72faa1
 Directory: 7.11
diff --git a/bonita_latest/files/WEB-INF/web.xml b/bonita_latest/files/WEB-INF/web.xml
index 7d7d66d..f21e6dd 100644
--- a/bonita_latest/files/WEB-INF/web.xml
+++ b/bonita_latest/files/WEB-INF/web.xml
@@ -60,11 +60,6 @@
             <param-value>i18ntranslation,session</param-value>
         </init-param>
     </filter>
-    <!-- SSO filter -->
-    <filter>
-        <filter-name>InternalSSOFilter</filter-name>
-        <filter-class>org.bonitasoft.console.common.server.sso.filter.InternalSSOFilter</filter-class>
-    </filter>
     <filter>
         <filter-name>AuthenticationFilter</filter-name>
         <filter-class>org.bonitasoft.console.common.server.login.filter.AuthenticationFilter</filter-class>
@@ -197,6 +192,7 @@
         <url-pattern>/portal/formsDocumentDownload</url-pattern>
         <url-pattern>/portal/documentDownload</url-pattern>
         <url-pattern>/portal/downloadDocument</url-pattern>
+        <url-pattern>/portal/pageDownload</url-pattern>
         <url-pattern>/services/*</url-pattern>
         <url-pattern>/portal/exportOrganization</url-pattern>
         <!--  Add more servlet mappings here -->
@@ -218,11 +214,6 @@
         <url-pattern>/portal/custom-page/API/system/session/*</url-pattern>
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
-    <filter-mapping>
-        <filter-name>InternalSSOFilter</filter-name>
-        <url-pattern>/portal/BonitaConsole.html</url-pattern>
-        <url-pattern>/portal/homepage</url-pattern>
-    </filter-mapping>
     <filter-mapping>
         <filter-name>BPMURLSupportFilter</filter-name>
         <url-pattern>/portal/BonitaConsole.html</url-pattern>
@@ -256,7 +247,6 @@
         <url-pattern>/portal/resource/*</url-pattern>
         <url-pattern>/portal/resource/app/*</url-pattern>
         <url-pattern>/apps/*</url-pattern>
-        <url-pattern>/portal/form/*</url-pattern>
         <url-pattern>/portal/custom-page/*</url-pattern>
     </filter-mapping>
 
@@ -331,6 +321,22 @@
             <param-value>bar</param-value>
         </init-param>
     </servlet>
+    <servlet>
+        <servlet-name>apiProcessUploadServlet</servlet-name>
+        <servlet-class>org.bonitasoft.console.common.server.servlet.TenantFileUploadServlet</servlet-class>
+        <init-param>
+            <param-name>SupportedExtensions</param-name>
+            <param-value>bar</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ReturnOriginalFilename</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ContentType</param-name>
+            <param-value>json</param-value>
+        </init-param>
+    </servlet>
     <servlet>
         <servlet-name>xmlUploadServlet</servlet-name>
         <servlet-class>org.bonitasoft.console.common.server.servlet.TenantFileUploadServlet</servlet-class>
@@ -420,12 +426,6 @@
         <servlet-name>exportProcessActorsServlet</servlet-name>
         <servlet-class>org.bonitasoft.console.server.servlet.ProcessActorsExportServlet</servlet-class>
     </servlet>
-    <!-- SSO -->
-    <servlet>
-        <servlet-name>SSOService</servlet-name>
-        <servlet-class>org.bonitasoft.console.common.server.sso.servlet.RedirectServlet</servlet-class>
-    </servlet>
-    <!-- End SSO -->
     <!-- Pages -->
     <servlet>
         <servlet-name>CustomPageServlet</servlet-name>
@@ -454,6 +454,22 @@
             <param-value>true</param-value>
         </init-param>
     </servlet>
+    <servlet>
+        <servlet-name>apiPageUploadServlet</servlet-name>
+        <servlet-class>org.bonitasoft.console.common.server.servlet.PageUploadServlet</servlet-class>
+        <init-param>
+            <param-name>SupportedExtensions</param-name>
+            <param-value>zip</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ContentType</param-name>
+            <param-value>json</param-value>
+        </init-param>
+        <init-param>
+            <param-name>ReturnOriginalFilename</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </servlet>
     <!-- End Pages -->
     <!-- Forms -->
     <servlet>
@@ -512,14 +528,14 @@
         <url-pattern>/theme/*</url-pattern>
         <url-pattern>/portal/custom-page/theme/*</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SSOService</servlet-name>
-        <url-pattern>/ssoservice</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>processUploadServlet</servlet-name>
         <url-pattern>/portal/processUpload</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>apiProcessUploadServlet</servlet-name>
+        <url-pattern>/API/processUpload</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>xmlUploadServlet</servlet-name>
         <url-pattern>/portal/organizationUpload</url-pattern>
@@ -635,11 +651,16 @@
     <servlet-mapping>
         <servlet-name>pageDownload</servlet-name>
         <url-pattern>/portal/pageDownload</url-pattern>
+        <url-pattern>/API/pageDownload</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>pageUploadServlet</servlet-name>
         <url-pattern>/portal/pageUpload</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>apiPageUploadServlet</servlet-name>
+        <url-pattern>/API/pageUpload</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>ProcessFormServlet</servlet-name>
         <url-pattern>/portal/form/*</url-pattern>
diff --git a/bonita_latest/files/config.sh b/bonita_latest/files/config.sh
old mode 100644
new mode 100755
diff --git a/bonita_latest/files/logging.properties b/bonita_latest/files/logging.properties
index 85aeeb9..4d045ea 100644
--- a/bonita_latest/files/logging.properties
+++ b/bonita_latest/files/logging.properties
@@ -6,10 +6,10 @@ handlers = java.util.logging.ConsoleHandler
 
 # The minimum level to log
 java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.BonitaSimpleFormatter
 
 # Allow logging to trace the actual logger producer class:
-java.util.logging.SimpleFormatter.format=%1$tF %1$tT.%1$tL %1$tz %4$s: %3$s %5$s%6$s%n
+org.apache.juli.BonitaSimpleFormatter.format=%1$tF %1$tT.%1$tL %1$tz %4$s (%7$s) %3$s %5$s%6$s%n
 # Use the following format to remove timestamp:
 #java.util.logging.SimpleFormatter.format=%4$s: %3$s %5$s%6$s%n
 
@@ -42,8 +42,8 @@ org.bonitasoft.engine.EngineInitializer.level = INFO
 #org.bonitasoft.engine.job.level = FINE
 #org.bonitasoft.engine.jobs.level = FINE
 #org.bonitasoft.engine.scheduler.level = FINE
-# Display monitoring information when property 'org.bonitasoft.engine.monitoring.logging.enable' is set to true in configuration file 'bonita-platform-community-custom.properties'
-org.bonitasoft.engine.configuration.LoggingMeterRegistry.level = INFO
+# Display monitoring information when property 'org.bonitasoft.engine.monitoring.publisher.logging.enable' is set to true in configuration file 'bonita-platform-community-custom.properties'
+org.bonitasoft.engine.configuration.monitoring.LoggingMeterRegistry.level = INFO
 # Specific logger for auditing work execution
 BONITA_WORK_AUDIT.EXECUTION.level = INFO
 
@@ -54,7 +54,7 @@ BONITA_WORK_AUDIT.EXECUTION.level = INFO
 # Hibernate is used by Bonita and very verbose in the log. Should stay with WARNING level except when debugging database access issues
 org.hibernate.level = WARNING
 # Remove wrong warnings about ehcache:
-org.hibernate.cache.ehcache.AbstractEhcacheRegionFactory.level = SEVERE
+org.hibernate.orm.cache.level = SEVERE
 
 # Ehcache is used by Bonita and very verbose in the log.  Should stay with WARNING level except when debugging cache issues
 net.sf.ehcache.level = WARNING
diff --git a/bonita_latest/files/startup.sh b/bonita_latest/files/startup.sh
old mode 100644
new mode 100755
diff --git a/bonita_latest/templates/setenv.sh b/bonita_latest/templates/setenv.sh
index b7e8066..33ef65d 100644
--- a/bonita_latest/templates/setenv.sh
+++ b/bonita_latest/templates/setenv.sh
@@ -28,3 +28,6 @@ if [ -z ${CATALINA_PID+x} ]; then
         CATALINA_PID=${CATALINA_BASE}/catalina.pid;
         export CATALINA_PID;
 fi
+
+# extra lib required at Tomcat startup (for instance bonita juli extensions)
+CLASSPATH="${CATALINA_HOME}/lib/ext/*"

@tianon
Copy link
Member

tianon commented Jul 2, 2020

+# extra lib required at Tomcat startup (for instance bonita juli extensions)
+CLASSPATH="${CATALINA_HOME}/lib/ext/*"

Did this one need to be exported also, or is this sufficient for how it gets used?

@educhastenier
Copy link
Contributor Author

+# extra lib required at Tomcat startup (for instance bonita juli extensions)
+CLASSPATH="${CATALINA_HOME}/lib/ext/*"

Did this one need to be exported also, or is this sufficient for how it gets used?

Good point. I'll double-check that and come back to you. Thx.

@educhastenier
Copy link
Contributor Author

educhastenier commented Jul 3, 2020

@tianon After checking, it is ok like that (even if would be better with the export, you are perfectly right).
So you can merge it like that.
Thx.

@tianon tianon merged commit 5f4851c into docker-library:master Jul 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants