Aggiunto nuovo log con ZIP

git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13421 edf0334f-4afc-450a-8f92-fe1409970e7d

Aggiunto nuovo log con ZIP
git-svn-id: http://svn.softecspa.it/desktopmate/DesktopMate%202.0/FileProxyServer/trunk@13421 edf0334f-4afc-450a-8f92-fe1409970e7d
m.veroni
1 parent 47518cd3
Showing 12 changed files with 67 additions and 32 deletions Show diff stats
.classpath
conf/ADT/production/WEB-INF/web.xml
conf/ADT/production/conf/log4j.xml
conf/ADT/production/version.xml
conf/ADT/test-liliana/WEB-INF/web.xml
conf/ADT/test-liliana/conf/log4j.xml
conf/ADT/test-liliana/version.xml
conf/version.properties
deployer-script.xml
lib/common/local/kahuna5j_4.2.3.jar → lib/common/local/kahuna5j_4.3.0.jar
src/conf/log4j.xml
src/it/softecspa/fileproxy/proxyservices/manager/core/WorkflowSession.java
@@ -118,11 +118,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/common/local/kahuna5j_4.2.3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="lib/common/local/s4_1.0.5.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -156,6 +151,11 @@
 	<classpathentry kind="lib" path="lib/axis/jaxrpc.jar"/>
 	<classpathentry kind="lib" path="lib/axis/saaj.jar"/>
 	<classpathentry kind="lib" path="lib/axis/wsdl4j.jar"/>
+	<classpathentry kind="lib" path="lib/common/local/kahuna5j_4.3.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/jdbc/mysql-connector-java-5.0.8-bin.jar"/>
 	<classpathentry kind="lib" path="lib/c3p0/c3p0-0.9.2.jar">
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>FileProxy 1.0.3 (20) - ADT/production [30/07/2014 17:10]</display-name>
+	<display-name>FileProxy 1.0.8 (32) - ADT/production [26/08/2014 15:57]</display-name>
 	<!-- Ultime modifiche del 23/06/2014 -->
 	<!-- Configurazione per New Relic -->
@@ -9,7 +9,7 @@
 		  <param-value>FileProxyServer ADT (production)</param-value>
 	</context-param>	
-	<!-- ADT/production - 30/07/2014 17:10 -->
+	<!-- ADT/production - 26/08/2014 15:57 -->
 	<!-- Configurazioni obbligatorie -->
 	<context-param>
 		<param-name>ErrorPage</param-name>
@@ -8,7 +8,8 @@
 		<param name="Directory" value="/var/www/web150/log/fileproxy" />
 		<param name="Prefix" value="${hostname}_service." />
 		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
+		<param name="Autoflush" value="30" />	
+		<param name="ArchiveAfter" value="1" />				
 		<layout class="org.apache.log4j.PatternLayout">																							
         	<!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->    
 			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
@@ -21,11 +22,24 @@
 		<param name="Directory" value="/var/www/web150/log/fileproxy/statement" />
 		<param name="Prefix" value="${hostname}_statement." />
 		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
+		<param name="Autoflush" value="60" />	
+		<param name="ArchiveAfter" value="1" />				
 		<layout class="org.apache.log4j.PatternLayout">																							
         	<param name="ConversionPattern" value="%m%n" />         
 		</layout> 	
 	</appender>
+	
+	<!-- STATS LOG -->
+	<appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
+		<param name="Directory" value="/var/www/web150/log/fileproxy/pool" />
+		<param name="Prefix" value="${hostname}_c3p0." />
+		<param name="Suffix" value=".log" />
+		<param name="Autoflush" value="5" />	
+		<param name="ArchiveAfter" value="1" />				
+		<layout class="org.apache.log4j.PatternLayout">																							
+        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
+		</layout> 	
+	</appender>
 	<!-- LOGGER SPECIFICI 
 	<category name="access" additivity="false">
@@ -61,7 +75,7 @@
 	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
 	     Impostare a INFO per tracciare le statistiche -->
 	<category name="it.softecspa.database.c3p0.stats" additivity="false">
-    	<priority value="OFF" />
+    	<priority value="TRACE" />
     	<appender-ref ref="c3p0StatsFile" />
 	</category>
@@ -3,10 +3,10 @@
 <properties>
 	<comment>Version information</comment>
-	<entry key="version.number">1.0.3</entry> 				
+	<entry key="version.number">1.0.8</entry> 				
 	<entry key="version.release"></entry>
-	<entry key="build.number">20</entry> 			
-	<entry key="build.date">30/07/2014 17:10</entry>
+	<entry key="build.number">32</entry> 			
+	<entry key="build.date">26/08/2014 15:57</entry>
 	<entry key="build.installation">ADT/production</entry>
 </properties>
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>FileProxy 1.0.3 (21) - ADT/test-liliana [30/07/2014 17:15]</display-name>
+	<display-name>FileProxy 1.0.8 (31) - ADT/test-liliana [26/08/2014 15:37]</display-name>
 	<!-- Ultime modifiche del 23/06/2014 -->
 	<!-- Configurazione per New Relic -->
@@ -9,7 +9,7 @@
 		  <param-value>FileProxyServer ADT (test)</param-value>
 	</context-param>	
-	<!-- ADT/test-liliana - 30/07/2014 17:15 -->
+	<!-- ADT/test-liliana - 26/08/2014 15:37 -->
 	<!-- Configurazioni obbligatorie -->
 	<context-param>
 		<param-name>ErrorPage</param-name>
@@ -8,7 +8,8 @@
 		<param name="Directory" value="/var/www/web144/log/adt_test_proxy" />
 		<param name="Prefix" value="${hostname}_service." />
 		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
+		<param name="Autoflush" value="30" />
+		<param name="ArchiveAfter" value="1" />					
 		<layout class="org.apache.log4j.PatternLayout">																							
         	<!-- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%C.%M():%L] - %m%n" /> -->    
 			<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} [%-5p] %m%n" />
@@ -21,12 +22,25 @@
 		<param name="Directory" value="/var/www/web144/log/adt_test_proxy/statement" />
 		<param name="Prefix" value="${hostname}_statement." />
 		<param name="Suffix" value=".log" />
-		<param name="Autoflush" value="15" />				
+		<param name="Autoflush" value="60" />		
+		<param name="ArchiveAfter" value="1" />			
 		<layout class="org.apache.log4j.PatternLayout">																							
         	<param name="ConversionPattern" value="%m%n" />         
 		</layout> 	
 	</appender>
+	<!-- STATS LOG -->
+	<appender name="c3p0StatsFile" class="it.softecspa.kahuna.log.DatedFileAppender">
+		<param name="Directory" value="/var/www/web144/log/adt_test_proxy/pool" />
+		<param name="Prefix" value="${hostname}_c3p0." />
+		<param name="Suffix" value=".log" />
+		<param name="Autoflush" value="5" />		
+		<param name="ArchiveAfter" value="1" />			
+		<layout class="org.apache.log4j.PatternLayout">																							
+        	<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %m%n" />         
+		</layout> 	
+	</appender>
+
 	<!-- LOGGER SPECIFICI 
 	<category name="access" additivity="false">
     	<priority value="INFO" />    	
@@ -60,7 +74,7 @@
 	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
 	     Impostare a INFO per tracciare le statistiche -->
 	<category name="it.softecspa.database.c3p0.stats" additivity="false">
-    	<priority value="OFF" />
+    	<priority value="TRACE" />
     	<appender-ref ref="c3p0StatsFile" />
 	</category>
@@ -3,10 +3,10 @@
 <properties>
 	<comment>Version information</comment>
-	<entry key="version.number">1.0.3</entry> 				
+	<entry key="version.number">1.0.8</entry> 				
 	<entry key="version.release"></entry>
-	<entry key="build.number">21</entry> 			
-	<entry key="build.date">30/07/2014 17:15</entry>
+	<entry key="build.number">31</entry> 			
+	<entry key="build.date">26/08/2014 15:37</entry>
 	<entry key="build.installation">ADT/test-liliana</entry>
 </properties>
 #Build Number for ANT. Do not edit!
-#Wed Jul 30 17:15:29 CEST 2014
-build.number=22
+#Tue Aug 26 15:57:19 CEST 2014
+build.number=33
 version.release=
-build.date=30/07/2014 17\:15
-version.number=1.0.3
+build.date=26/08/2014 15\:57
+version.number=1.0.8
@@ -279,9 +279,16 @@
 		<echo>* context = ${context}</echo>
 		<echo>* war (locale) = ${warfile.name}</echo>
+		<!-- Workaround per web150 -->
+		<echo message="Undeploy di sicurezza automatico" />
+		<antcall target="remote.exec">
+			<param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -u -f</param>
+		</antcall>
+		
+		
 		<echo message="Deploy automatico" />
 		<antcall target="remote.exec">
-			<param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -c -f</param>
+			<param name="command">cd ${remote.path} &amp;&amp; tomcat-deploy -f</param>
 		</antcall>
 		<echo>Deploy completato su tutti i nodi</echo>
@@ -79,7 +79,7 @@
 	<!-- Logger utilizzato per il monitoraggio statistico delle connessioni verso il datasource
 	     Impostare a INFO per tracciare le statistiche -->	
 	<category name="it.softecspa.database.c3p0.stats" additivity="false">
-		<priority value="OFF" />
+		<priority value="TRACE" />
     	<appender-ref ref="c3p0Stats" />
 	</category>
 package it.softecspa.fileproxy.proxyservices.manager.core;
 import it.softecspa.database.dbconnect.ConnectionManager;
-import it.softecspa.database.dbconnect.DatabaseStatementUnplugged;
-import it.softecspa.database.dbconnect.NoRecordFoundException;
 import it.softecspa.fileproxy.proxyservices.core.GlobalHttpProxyRequest;
 import it.softecspa.fileproxy.services.ServerCacheFactory;
 import it.softecspa.fileproxy.services.common.CheckerException;
@@ -13,7 +11,6 @@ import it.softecspa.jwebber.bo.Utente;
 import it.softecspa.kahuna.lang.XString;
 import it.softecspa.mvc.businessobject.DatabaseManager;
 import it.softecspa.mvc.exceptions.AuthenticationException;
-import it.softecspa.portal.Parameters;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -66,7 +63,10 @@ public class WorkflowSession&lt;I extends GlobalHttpProxyRequest&gt; extends Universal
 		} finally {
 			DatabaseManager.closeConnection(connection);				
 		}
-			
+		
+		/*
+		 * Eliminato per velocizzare la richiesta
+		 * E' fatta solo la verifica del'utente
 		Parameters parameters = Parameters.getInstance();
 		if (!utente.hasPolicy(parameters.get("POL_SA","SA")) && 
@@ -75,7 +75,7 @@ public class WorkflowSession&lt;I extends GlobalHttpProxyRequest&gt; extends Universal
 			log.error("Not valid policy for username '"+request.getUsername()+"'");
 			throw new CheckerException(ResponseOutcome.USER_POLICY_NO_VALID);
 		}
-			
+		*/