private static final long TWENTYFOUR_HOURS = (24 * 60 * 60 * 1000L);\r
private static final String FMT_1 = "yyyy-MM-dd'T'HH:mm:ss'Z'";\r
private static final String FMT_2 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";\r
+ private static final String PUBLISHSQL = "publishSQL";\r
+ private static final String STATUSSQL = "statusSQL";\r
+ private static final String RESULTSQL = "resultSQL";\r
+ private static final String FILENAMESQL = "filenameSQL";\r
+ private static final String TIMESQL = "timeSQL";\r
+ private static final String LOG_RECORDSSQL = "select * from LOG_RECORDS where FEEDID = ";\r
\r
private final boolean isfeedlog;\r
\r
eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
- eelfLogger.info(EelfMsgs.EXIT);\r
- }\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
+ }\r
}\r
/**\r
* GET a logging URL -- retrieve logging data for a feed or subscription.\r
}\r
out.print("]");\r
} catch (IOException ioe) {\r
- eventlogger.error("IOException: " + ioe.getMessage());\r
+ eventlogger.error("PROV0141 LogServlet.doGet: " + ioe.getMessage(), ioe);\r
}\r
} finally {\r
eelfLogger.info(EelfMsgs.EXIT);\r
setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\r
eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");\r
- String message = "PUT not allowed for the logURL.";\r
- EventLogRecord elr = new EventLogRecord(req);\r
- elr.setMessage(message);\r
- elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
- eventlogger.error(elr.toString());\r
- sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");\r
+ String message = "PUT not allowed for the logURL.";\r
+ EventLogRecord elr = new EventLogRecord(req);\r
+ elr.setMessage(message);\r
+ elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
+ eventlogger.error(elr.toString());\r
+ sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
eelfLogger.info(EelfMsgs.EXIT);\r
}\r
setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);\r
eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
- String message = "POST not allowed for the logURL.";\r
- EventLogRecord elr = new EventLogRecord(req);\r
- elr.setMessage(message);\r
- elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
- eventlogger.error(elr.toString());\r
- sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+ String message = "POST not allowed for the logURL.";\r
+ EventLogRecord elr = new EventLogRecord(req);\r
+ elr.setMessage(message);\r
+ elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
+ eventlogger.error(elr.toString());\r
+ sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
eelfLogger.info(EelfMsgs.EXIT);\r
}\r
Map<String, String> map = new HashMap<>();\r
String s = req.getParameter("type");\r
if (s != null) {\r
- if (s.equals("pub") || s.equals("del") || s.equals("exp")) {\r
+ if ("pub".equals(s) || "del".equals(s) || "exp".equals(s)) {\r
map.put("type", s);\r
} else {\r
map.put("err", "bad type");\r
} else {\r
map.put("type", "all");\r
}\r
- map.put("publishSQL", "");\r
- map.put("statusSQL", "");\r
- map.put("resultSQL", "");\r
- map.put("reasonSQL", "");\r
- map.put("filenameSQL", "");\r
+ map.put(PUBLISHSQL, "");\r
+ map.put(STATUSSQL, "");\r
+ map.put(RESULTSQL, "");\r
+ map.put(REASON_SQL, "");\r
+ map.put(FILENAMESQL, "");\r
\r
s = req.getParameter("publishId");\r
if (s != null) {\r
map.put("err", "bad publishId");\r
return map;\r
}\r
- map.put("publishSQL", " AND PUBLISH_ID = '"+s+"'");\r
+ map.put(PUBLISHSQL, " AND PUBLISH_ID = '"+s+"'");\r
}\r
\r
s = req.getParameter("filename");\r
if (s != null) {\r
- map.put("filenameSQL", " AND FILENAME = '"+s+"'");\r
+ map.put(FILENAMESQL, " AND FILENAME = '" + s + "'");\r
}\r
\r
s = req.getParameter("statusCode");\r
if (s != null) {\r
String sql = null;\r
- if (s.equals("success")) {\r
- sql = " AND STATUS >= 200 AND STATUS < 300";\r
- } else if (s.equals("redirect")) {\r
- sql = " AND STATUS >= 300 AND STATUS < 400";\r
- } else if (s.equals("failure")) {\r
- sql = " AND STATUS >= 400";\r
- } else {\r
- try {\r
- Integer n = Integer.parseInt(s);\r
- if ((n >= 100 && n < 600) || (n == -1))\r
- sql = " AND STATUS = " + n;\r
- } catch (NumberFormatException e) {\r
- }\r
+ switch (s) {\r
+ case "success":\r
+ sql = " AND STATUS >= 200 AND STATUS < 300";\r
+ break;\r
+ case "redirect":\r
+ sql = " AND STATUS >= 300 AND STATUS < 400";\r
+ break;\r
+ case "failure":\r
+ sql = " AND STATUS >= 400";\r
+ break;\r
+ default:\r
+ try {\r
+ int n = Integer.parseInt(s);\r
+ if ((n >= 100 && n < 600) || (n == -1)) {\r
+ sql = " AND STATUS = " + n;\r
+ }\r
+ } catch (NumberFormatException e) {\r
+ intlogger.error("Failed to parse input", e);\r
+ }\r
+ break;\r
}\r
if (sql == null) {\r
map.put("err", "bad statusCode");\r
return map;\r
}\r
- map.put("statusSQL", sql);\r
- map.put("resultSQL", sql.replaceAll("STATUS", "RESULT"));\r
+ map.put(STATUSSQL, sql);\r
+ map.put(RESULTSQL, sql.replaceAll("STATUS", "RESULT"));\r
}\r
\r
s = req.getParameter("expiryReason");\r
if (s != null) {\r
map.put("type", "exp");\r
- if (s.equals("notRetryable")) {\r
- map.put("reasonSQL", " AND REASON = 'notRetryable'");\r
- } else if (s.equals("retriesExhausted")) {\r
- map.put("reasonSQL", " AND REASON = 'retriesExhausted'");\r
- } else if (s.equals("diskFull")) {\r
- map.put("reasonSQL", " AND REASON = 'diskFull'");\r
- } else if (s.equals("other")) {\r
- map.put("reasonSQL", " AND REASON = 'other'");\r
+ if ("notRetryable".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'notRetryable'");\r
+ } else if ("retriesExhausted".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'retriesExhausted'");\r
+ } else if ("diskFull".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'diskFull'");\r
+ } else if ("other".equals(s)) {\r
+ map.put(REASON_SQL, " AND REASON = 'other'");\r
} else {\r
map.put("err", "bad expiryReason");\r
return map;\r
} else if (etime == 0) {\r
etime = stime + TWENTYFOUR_HOURS;\r
}\r
- map.put("timeSQL", String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));\r
+ map.put(TIMESQL, String.format(" AND EVENT_TIME >= %d AND EVENT_TIME <= %d", stime, etime));\r
return map;\r
}\r
private long getTimeFromParam(final String s) {\r
Date d = sdf.parse(s);\r
return d.getTime();\r
} catch (ParseException parseException) {\r
- intlogger.error("Exception in getting Time :- "+parseException.getMessage(),parseException);\r
+ intlogger.error("Exception in getting Time :- " + parseException.getMessage(),parseException);\r
}\r
try {\r
// Also allow a long (in ms); useful for testing\r
- long n = Long.parseLong(s);\r
- return n;\r
+ return Long.parseLong(s);\r
} catch (NumberFormatException numberFormatException) {\r
- intlogger.error("Exception in getting Time :- "+numberFormatException.getMessage(),numberFormatException);\r
+ intlogger.error("Exception in getting Time :- " + numberFormatException.getMessage(),numberFormatException);\r
}\r
- intlogger.info("Error parsing time="+s);\r
+ intlogger.info("Error parsing time=" + s);\r
return -1;\r
}\r
\r
private void getPublishRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {\r
String type = map.get("type");\r
- if (type.equals("all") || type.equals("pub")) {\r
- String sql = "select * from LOG_RECORDS where FEEDID = "+feedid\r
+ if ("all".equals(type) || "pub".equals(type)) {\r
+ String sql = LOG_RECORDSSQL + feedid\r
+ " AND TYPE = 'pub'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL") + map.get("filenameSQL");\r
+ + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(STATUSSQL) + map.get(FILENAMESQL);\r
getRecordsForSQL(sql, rh);\r
}\r
}\r
private void getDeliveryRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {\r
String type = map.get("type");\r
- if (type.equals("all") || type.equals("del")) {\r
- String sql = "select * from LOG_RECORDS where FEEDID = "+feedid\r
+ if ("all".equals(type) || "del".equals(type)) {\r
+ String sql = LOG_RECORDSSQL + feedid\r
+ " AND TYPE = 'del'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("resultSQL");\r
+ + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(RESULTSQL);\r
getRecordsForSQL(sql, rh);\r
}\r
}\r
private void getDeliveryRecordsForSubscription(int subid, RowHandler rh, Map<String, String> map) {\r
String type = map.get("type");\r
- if (type.equals("all") || type.equals("del")) {\r
- String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = "+subid\r
+ if ("all".equals(type) || "del".equals(type)) {\r
+ String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = " + subid\r
+ " AND TYPE = 'del'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("resultSQL");\r
+ + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(RESULTSQL);\r
getRecordsForSQL(sql, rh);\r
}\r
}\r
private void getExpiryRecordsForFeed(int feedid, RowHandler rh, Map<String, String> map) {\r
String type = map.get("type");\r
- if (type.equals("all") || type.equals("exp")) {\r
- String st = map.get("statusSQL");\r
+ if ("all".equals(type) || "exp".equals(type)) {\r
+ String st = map.get(STATUSSQL);\r
if (st == null || st.length() == 0) {\r
- String sql = "select * from LOG_RECORDS where FEEDID = "+feedid\r
+ String sql = LOG_RECORDSSQL + feedid\r
+ " AND TYPE = 'exp'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("reasonSQL");\r
+ + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(REASON_SQL);\r
getRecordsForSQL(sql, rh);\r
}\r
}\r
}\r
private void getExpiryRecordsForSubscription(int subid, RowHandler rh, Map<String, String> map) {\r
String type = map.get("type");\r
- if (type.equals("all") || type.equals("exp")) {\r
- String st = map.get("statusSQL");\r
+ if ("all".equals(type) || "exp".equals(type)) {\r
+ String st = map.get(STATUSSQL);\r
if (st == null || st.length() == 0) {\r
- String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = "+subid\r
+ String sql = "select * from LOG_RECORDS where DELIVERY_SUBID = " + subid\r
+ " AND TYPE = 'exp'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("reasonSQL");\r
+ + map.get(TIMESQL) + map.get(PUBLISHSQL) + map.get(REASON_SQL);\r
getRecordsForSQL(sql, rh);\r
}\r
}\r
}\r
+\r
private void getRecordsForSQL(String sql, RowHandler rh) {\r
intlogger.debug(sql);\r
long start = System.currentTimeMillis();\r
Connection conn = null;\r
try {\r
conn = db.getConnection();\r
- try( Statement stmt = conn.createStatement()){\r
- try(ResultSet rs = stmt.executeQuery(sql)){\r
- while (rs.next()) {\r
- rh.handleRow(rs);\r
- }\r
- }\r
- }\r
+ try (Statement stmt = conn.createStatement()) {\r
+ try (ResultSet rs = stmt.executeQuery(sql)) {\r
+ while (rs.next()) {\r
+ rh.handleRow(rs);\r
+ }\r
+ }\r
+ }\r
} catch (SQLException sqlException) {\r
- intlogger.info("Failed to get Records. Exception = " +sqlException.getMessage(),sqlException);\r
+ intlogger.info("Failed to get Records. Exception = " + sqlException.getMessage(),sqlException);\r
} finally {\r
if (conn != null)\r
db.release(conn);\r
}\r
- intlogger.debug("Time: " + (System.currentTimeMillis()-start) + " ms");\r
+ intlogger.debug("Time: " + (System.currentTimeMillis() - start) + " ms");\r
}\r
}\r
Code Review / dmaap / datarouter.git / blobdiff