xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3027 fix logservice's build script and reconnect logic if error occurs" into omaha_14.4.1

Browse source 
Former-commit-id: 77b368f72d [formerly cef403d0ac [formerly 2f787e330e6e93f7d77aebeec968191382d9e062]]
Former-commit-id: cef403d0ac
Former-commit-id: 221b411022
This commit is contained in:
Nate Jensen 2014-06-10 10:45:26 -05:00 • committed by Gerrit Code Review
commit 534fa5409b
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
javaUtilities/com.raytheon.uf.logsrv/build.xml
View file

@ -19,7 +19,8 @@
--> -->
<project name="com.raytheon.uf.logsrv" default="dist"> <project name="com.raytheon.uf.logsrv" default="dist">
<property name="foss" location="../../cots/"/> <property name="corefoss" location="../../../ufcore-foss/lib/"/>
<property name="a2foss" location="../../../AWIPS2_foss/lib/"/>
<property name="src" location="src"/> <property name="src" location="src"/>
<property name="bin" location="bin"/> <property name="bin" location="bin"/>
<property name="qualifier" value="${date}"/> <property name="qualifier" value="${date}"/>
@ -66,24 +67,24 @@
<target name="tar" depends="build"> <target name="tar" depends="build">
<tar destfile="${ant.project.name}-${Bundle-Version}.tar.gz" compression="gzip"> <tar destfile="${ant.project.name}-${Bundle-Version}.tar.gz" compression="gzip">
<tarfileset dir="${foss}/org.slf4j" prefix="${prefix}/lib/"> <tarfileset dir="${corefoss}/org.slf4j" prefix="${prefix}/lib/">
<include name="slf4j-api*.jar"/> <include name="slf4j-api*.jar"/>
<exclude name="*sources.jar"/> <exclude name="*sources.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${foss}/ch.qos.logback" prefix="${prefix}/lib/"> <tarfileset dir="${corefoss}/ch.qos.logback" prefix="${prefix}/lib/">
<include name="logback*.jar"/> <include name="logback*.jar"/>
<exclude name="*sources.jar"/> <exclude name="*sources.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${foss}/org.apache.derby" prefix="${prefix}/lib/"> <tarfileset dir="${a2foss}/org.apache.derby" prefix="${prefix}/lib/">
<include name="derby*.jar"/> <include name="derby*.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${foss}/javax.mail" prefix="${prefix}/lib/"> <tarfileset dir="${a2foss}/javax.mail" prefix="${prefix}/lib/">
<include name="mail.jar"/> <include name="mail.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${foss}/org.quartz" prefix="${prefix}/lib/"> <tarfileset dir="${corefoss}/org.quartz" prefix="${prefix}/lib/">
<include name="quartz*.jar"/> <include name="quartz*.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="${foss}/org.apache.commons.lang" prefix="${prefix}/lib/"> <tarfileset dir="${corefoss}/org.apache.commons.lang" prefix="${prefix}/lib/">
<include name="commons-lang*.jar"/> <include name="commons-lang*.jar"/>
</tarfileset> </tarfileset>
<tarfileset dir="./" prefix="${prefix}/lib/"> <tarfileset dir="./" prefix="${prefix}/lib/">

3
javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
View file

@ -36,6 +36,7 @@ import com.raytheon.uf.logsrv.StoredMsg;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Aug 27, 2013 njensen Initial creation * Aug 27, 2013 njensen Initial creation
* Jun 09, 2014 3027 njensen Change shouldStoreMsg() to protected
* *
* </pre> * </pre>
* *
@ -71,7 +72,7 @@ public class DerbyAppender extends AppenderBase<ILoggingEvent> {
* @param event * @param event
* @return * @return
*/ */
private boolean shouldStoreMsg(ILoggingEvent event) { protected boolean shouldStoreMsg(ILoggingEvent event) {
return true; return true;
} }
} }

6
javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyDao.java
View file

@ -46,6 +46,7 @@ import com.raytheon.uf.logsrv.report.data.LogReportEvent;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Aug 27, 2013 njensen Initial creation * Aug 27, 2013 njensen Initial creation
* Jun 09, 2014 3027 njensen Fix reconnect after error logic
* *
* </pre> * </pre>
* *
@ -269,7 +270,10 @@ public class DerbyDao {
} catch (SQLException e) { } catch (SQLException e) {
// ignore // ignore
} }
connection = null; if (connection.equals(this.connection)) {
this.connection = null;
}
} }
try { try {