Merge branch 'develop' into feature/Feature-Iban

ems-core/pom.xml

@@ -444,6 +444,7 @@
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
             <version>3.4.4</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

ems-core/src/main/java/it/integry/ems/listener/Log4jShutdownListener.java

@@ -13,6 +13,20 @@ public class Log4jShutdownListener implements ServletContextListener {
 
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
-        LogManager.shutdown();
+        try {
+            // Pulizia esplicita del ThreadLocal
+//            ContextAnchor.THREAD_CONTEXT.remove();
+
+            // Shutdown completo di Log4j
+            LogManager.shutdown();
+
+            // Attesa per completamento shutdown
+            Thread.sleep(500);
+
+            // Forza garbage collection
+            System.gc();
+        } catch (Exception e) {
+            System.err.println("Errore durante la pulizia dei ThreadLocal di Log4j: " + e.getMessage());
+        }
     }
 }

ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java

@@ -95,6 +95,7 @@ public enum IntegryCustomer {
     ResinaColor(IntegryCustomerDB.ResinaColor_ResinaColor, IntegryCustomerDB.ResinaColor_ResinaColorPasquale),
     RistoCash(IntegryCustomerDB.RistoCash_RistoCash),
     RossoGargano(IntegryCustomerDB.RossoGargano_RossoGargano, IntegryCustomerDB.RossoGargano_RossoGarganoCont),
+    Sabato(IntegryCustomerDB.Sabato_Sabato),
     Salpar(IntegryCustomerDB.Salpar_AlfaImmobiliare,
             IntegryCustomerDB.Salpar_MasabaSrl,
             IntegryCustomerDB.Salpar_Salpar,

ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java

@@ -155,6 +155,8 @@ public enum IntegryCustomerDB {
     RossoGargano_RossoGargano("rossogargano"),
     RossoGargano_RossoGarganoCont("rossogarganocont"),
 
+    Sabato_Sabato("sabato"),
+
 
     Salpar_VgAlimenti("vgalimenti"),
     Salpar_Salpar("salpar"),

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250619160709.java

@@ -0,0 +1,33 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.IntegryCustomer;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20250619160709 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        createSetup("W_CSCADCLIFOR_ELENCO_DISP", "DATAWINDOW", "D_CSCADCLIFOR_ELENCO_REP", null,
+                            null, false, null, false, false,
+                            false, false, false, null, false, null);
+
+        if(isCustomer(IntegryCustomer.Sabato)) {
+            updateSetupValue("W_CSCADCLIFOR_ELENCO_DISP", "DATAWINDOW", "D_CSCADCLIFOR_ELENCO_REP", "d_cscadclifor_elenco_rep_sabato");
+
+        }
+    }
+
+
+
+
+
+    @Override
+    public void down() throws Exception {
+
+    }
+
+}

ems-engine/src/main/resources/log4j2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn">
+<Configuration status="warn" shutdownHook="enable" shutdownTimeout="10000">
     <Properties>
         <Property name="basePath">${sys:catalina.home}/logs/</Property>
         <Property name="maxBackupIndex">30</Property>
@@ -58,10 +58,10 @@
 
     <Loggers>
         <!-- Root Logger -->
-        <Root level="INFO">
+        <AsyncRoot level="INFO">
             <AppenderRef ref="console"/>
             <AppenderRef ref="primaryFileLogger"/>
-        </Root>
+        </AsyncRoot>
 
         <!-- Spring Framework Loggers -->
 <!--        <AsyncLogger name="org.springframework" level="DEBUG" additivity="false">-->
@@ -85,7 +85,7 @@
 <!--        <AsyncLogger name="org.jboss.resteasy" level="INFO" additivity="false"/>-->
 
         <!-- Application Logger -->
-        <AsyncLogger name="it.integry" level="DEBUG" additivity="false">
+        <AsyncLogger name="it.integry" level="DEBUG" additivity="false" includeLocation="true">
             <AppenderRef ref="console" />
             <AppenderRef ref="primaryFileLogger" />
             <AppenderRef ref="errorFileLogger" level="ERROR"/>

ems-engine/src/main/webapp/WEB-INF/web.xml

@@ -19,6 +19,9 @@
         <param-name>log4jConfiguration</param-name>
         <param-value>classpath:log4j2.xml</param-value>
     </context-param>
+    <listener>
+        <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
+    </listener>
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
@@ -26,11 +29,8 @@
         <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
     </listener>
     <listener>
-        <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
+        <listener-class>it.integry.ems.listener.Log4jShutdownListener</listener-class>
     </listener>
-<!--    <listener>-->
-<!--        <listener-class>it.integry.ems.listener.Log4jShutdownListener</listener-class>-->
-<!--    </listener>-->
 
     <servlet>
         <servlet-name>SpringDispatcherServlet</servlet-name>