X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FLogRecord.java;h=b7b82729ec2877bab52d9edfa3ac945018aa77ab;hb=5da50e90e6c78700d48d7468849d4a1599a249b3;hp=70b8e6a05291935bc989feaa79499936d6f253d6;hpb=ac12c63cc36197e569fba1c54e45b1b999384321;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
index 70b8e6a0..b7b82729 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/LogRecord.java
@@ -30,22 +30,22 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.sql.Types;
 import java.text.ParseException;
 import java.util.Iterator;
-
+import org.apache.log4j.Logger;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.onap.dmaap.datarouter.provisioning.utils.RLEBitSet;
 
 /**
- * The representation of a Log Record, as retrieved from the DB.  Since this record format is only used
- * to replicate between provisioning servers, it is very bare-bones; e.g. there are no field setters and only 1 getter.
+ * The representation of a Log Record, as retrieved from the DB.  Since this record format is only used to replicate
+ * between provisioning servers, it is very bare-bones; e.g. there are no field setters and only 1 getter.
  *
  * @author Robert Eby
  * @version $Id: LogRecord.java,v 1.7 2014/03/12 19:45:41 eby Exp $
  */
 public class LogRecord extends BaseLogRecord {
+
     /**
      * Print all log records whose RECORD_IDs are in the bit set provided.
      *
@@ -53,34 +53,29 @@ public class LogRecord extends BaseLogRecord {
      * @param bs the {@link RLEBitSet} listing the record IDs to print
      * @throws IOException
      */
+    private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.beans");
+
     public static void printLogRecords(OutputStream os, RLEBitSet bs) throws IOException {
         final String sql = "select * from LOG_RECORDS where RECORD_ID >= ? AND RECORD_ID <= ?";
         DB db = new DB();
-        Connection conn = null;
-        try {
-            conn = db.getConnection();
-            try(Statement stmt = conn.createStatement()) {
-                Iterator<Long[]> iter = bs.getRangeIterator();
-                try(PreparedStatement ps = conn.prepareStatement(sql)) {
-                    while (iter.hasNext()) {
-                        Long[] n = iter.next();
-                        ps.setLong(1, n[0]);
-                        ps.setLong(2, n[1]);
-                        try(ResultSet rs = ps.executeQuery()) {
-                            while (rs.next()) {
-                                LogRecord lr = new LogRecord(rs);
-                                os.write(lr.toString().getBytes());
-                            }
-                            ps.clearParameters();
+        try (Connection conn = db.getConnection()) {
+            Iterator<Long[]> iter = bs.getRangeIterator();
+            try (PreparedStatement ps = conn.prepareStatement(sql)) {
+                while (iter.hasNext()) {
+                    Long[] n = iter.next();
+                    ps.setLong(1, n[0]);
+                    ps.setLong(2, n[1]);
+                    try (ResultSet rs = ps.executeQuery()) {
+                        while (rs.next()) {
+                            LogRecord lr = new LogRecord(rs);
+                            os.write(lr.toString().getBytes());
                         }
+                        ps.clearParameters();
                     }
                 }
             }
         } catch (SQLException e) {
-            e.printStackTrace();
-        } finally {
-            if (conn != null)
-                db.release(conn);
+            intlogger.error("SQLException: " + e.getMessage());
         }
     }
 
@@ -96,6 +91,7 @@ public class LogRecord extends BaseLogRecord {
     private final String reason;
     private final long record_id;
     private final long clength2;
+    private final String fileName;
 
     public LogRecord(ResultSet rs) throws SQLException {
         super(rs);
@@ -114,6 +110,7 @@ public class LogRecord extends BaseLogRecord {
 
         this.record_id = rs.getLong("RECORD_ID");
         this.clength2 = rs.getLong("CONTENT_LENGTH_2");
+        this.fileName = rs.getString("FILENAME");
     }
 
     public LogRecord(String[] pp) throws ParseException {
@@ -132,7 +129,8 @@ public class LogRecord extends BaseLogRecord {
         this.reason = pp[17];
 
         this.record_id = Long.parseLong(pp[18]);
-        this.clength2 = (pp.length == 20) ? Long.parseLong(pp[19]) : 0;
+        this.clength2 = (pp.length == 21) ? Long.parseLong(pp[19]) : 0;
+        this.fileName = pp[20];
     }
 
     public long getRecordId() {
@@ -181,6 +179,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(17, Types.VARCHAR);
             ps.setLong(18, record_id);
             ps.setNull(19, Types.BIGINT);
+            ps.setString(20, fileName);
         } else if (type.equals("del")) {
             ps.setNull(9, Types.VARCHAR);
             ps.setNull(10, Types.VARCHAR);
@@ -193,6 +192,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(17, Types.VARCHAR);
             ps.setLong(18, record_id);
             ps.setNull(19, Types.BIGINT);
+            ps.setString(20, fileName);
         } else if (type.equals("exp")) {
             ps.setNull(9, Types.VARCHAR);
             ps.setNull(10, Types.VARCHAR);
@@ -205,6 +205,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setString(17, reason);
             ps.setLong(18, record_id);
             ps.setNull(19, Types.BIGINT);
+            ps.setString(20, fileName);
         } else if (type.equals("pbf")) {
             ps.setString(9, feedFileid);
             ps.setString(10, remoteAddr);
@@ -217,6 +218,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(17, Types.VARCHAR);
             ps.setLong(18, record_id);
             ps.setLong(19, clength2);
+            ps.setString(20, fileName);
         } else if (type.equals("dlx")) {
             ps.setNull(9, Types.VARCHAR);
             ps.setNull(10, Types.VARCHAR);
@@ -229,6 +231,7 @@ public class LogRecord extends BaseLogRecord {
             ps.setNull(17, Types.VARCHAR);
             ps.setLong(18, record_id);
             ps.setLong(19, clength2);
+            ps.setString(20, fileName);
         }
     }