update DR logging to log under one system

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / reports / FeedReport.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
index 4346a0e..6529788 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/FeedReport.java
@@ -72,55 +72,26 @@ public class FeedReport extends ReportBase {
            try( PreparedStatement ps = conn.prepareStatement(SELECT_SQL)) {\r
                try (ResultSet rs = ps.executeQuery()) {\r
                    while (rs.next()) {\r
-                       if (alg1) {\r
-                           String date = rs.getString("date");\r
-                           String type = rs.getString("type");\r
-                           int feedid = rs.getInt("feedid");\r
-                           int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;\r
-                           int count = rs.getInt("count");\r
-                           sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");\r
-                       } else {\r
-                           String date = rs.getString("date");\r
-                           JSONObject datemap = jo.optJSONObject(date);\r
-                           if (datemap == null) {\r
-                               datemap = new JSONObject();\r
-                               jo.put(date, datemap);\r
-                           }\r
-                           int feed = rs.getInt("FEEDID");\r
-                           JSONObject feedmap = datemap.optJSONObject("" + feed);\r
-                           if (feedmap == null) {\r
-                               feedmap = new JSONObject();\r
-                               feedmap.put("pubcount", 0);\r
-                               datemap.put("" + feed, feedmap);\r
-                           }\r
-                           String type = rs.getString("TYPE");\r
-                           int count = rs.getInt("count");\r
-                           if (type.equals("pub")) {\r
-                               feedmap.put("pubcount", count);\r
-                           } else if (type.equals("del")) {\r
-                               String subid = "" + rs.getInt("DELIVERY_SUBID");\r
-                               feedmap.put(subid, count);\r
-                           }\r
-                       }\r
+                       String date = rs.getString("date");\r
+                       String type = rs.getString("type");\r
+                       int feedid = rs.getInt("feedid");\r
+                       int subid = type.equals("del") ? rs.getInt("delivery_subid") : 0;\r
+                       int count = rs.getInt("count");\r
+                       sb.append(date + "," + type + "," + feedid + "," + subid + "," + count + "\n");\r
                    }\r
                }\r
            }\r
         db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            logger.error(e.toString());\r
         }\r
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");\r
-        try {\r
-            PrintWriter os = new PrintWriter(outfile);\r
-            if (alg1) {\r
-                os.print("date,type,feedid,subid,count\n");\r
-                os.print(sb.toString());\r
-            } else {\r
-                os.println(toHTML(jo));\r
-            }\r
-            os.close();\r
+        try (PrintWriter os = new PrintWriter(outfile)) {\r
+            os.print("date,type,feedid,subid,count\n");\r
+            os.print(sb.toString());\r
         } catch (FileNotFoundException e) {\r
             System.err.println("File cannot be written: " + outfile);\r
+            logger.error(e.toString());\r
         }\r
     }\r
 \r
@@ -159,6 +130,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + 1);\r
                             } catch (JSONException e) {\r
                                 feedmap.put("pubcount", 1);\r
+                                logger.error(e.toString());\r
                             }\r
                         } else if (type.equals("del")) {\r
                             String subid = "" + rs.getInt("DELIVERY_SUBID");\r
@@ -167,6 +139,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + 1);\r
                             } catch (JSONException e) {\r
                                 feedmap.put(subid, 1);\r
+                                logger.error(e.toString());\r
                             }\r
                         }\r
                     }\r
@@ -174,7 +147,7 @@ public class FeedReport extends ReportBase {
             }\r
              db.release(conn);\r
         } catch (SQLException e) {\r
-            e.printStackTrace();\r
+            logger.error(e.toString());\r
         }\r
         logger.debug("Query time: " + (System.currentTimeMillis() - start) + " ms");\r
         try {\r
@@ -183,6 +156,7 @@ public class FeedReport extends ReportBase {
             os.close();\r
         } catch (FileNotFoundException e) {\r
             System.err.println("File cannot be written: " + outfile);\r
+            logger.error(e.toString());\r
         }\r
     }\r
 \r
@@ -309,7 +283,7 @@ public class FeedReport extends ReportBase {
      *\r
      * @param args\r
      */\r
-    public static void main(String[] args) {\r
+    public void main(String[] args) {\r
         int rtype = 0;    // 0 -> day, 1 -> week, 2 -> month, 3 -> year\r
         String infile = null;\r
         String outfile = null;\r
@@ -380,6 +354,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put("pubcount", n + count);\r
                             } catch (JSONException e) {\r
                                 feedmap.put("pubcount", count);\r
+                                logger.error(e.toString());\r
                             }\r
                         } else if (type.equals("del")) {\r
                             String subid = tt[3];\r
@@ -388,6 +363,7 @@ public class FeedReport extends ReportBase {
                                 feedmap.put(subid, n + count);\r
                             } catch (JSONException e) {\r
                                 feedmap.put(subid, count);\r
+                                logger.error(e.toString());\r
                             }\r
                         }\r
                     }\r
@@ -409,7 +385,7 @@ public class FeedReport extends ReportBase {
             System.out.println(t);\r
         } catch (Exception e) {\r
             System.err.println(e);\r
-            e.printStackTrace();\r
+            logger.error(e.toString());\r
         }\r
     }\r
 }\r