@SuppressWarnings("serial")\r
public class LogServlet extends BaseServlet {\r
//Adding EELF Logger Rally:US664892\r
- private static EELFLogger eelflogger = EELFManager.getInstance().getLogger(LogServlet.class);\r
+ private static EELFLogger eelfLogger = EELFManager.getInstance().getLogger(LogServlet.class);\r
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
\r
- private static boolean isfeedlog;\r
+ private final boolean isfeedlog;\r
\r
public abstract class RowHandler {\r
private final ServletOutputStream out;\r
@Override\r
public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
String message = "DELETE 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.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
/**\r
@Override\r
public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
int id = getIdFromPath(req);\r
if (id < 0) {\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, "Missing or bad feed/subscription number.", eventlogger);\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
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
/**\r
@Override\r
public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_FEEDID, req.getHeader(BEHALF_HEADER),getIdFromPath(req)+"");\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.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
/**\r
@Override\r
public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);\r
- eelflogger.info(EelfMsgs.ENTRY);\r
+ eelfLogger.info(EelfMsgs.ENTRY);\r
try {\r
- eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\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.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
map.put("err", "bad type");\r
return map;\r
}\r
- } else\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
\r
s = req.getParameter("publishId");\r
if (s != null) {\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
+ }\r
+\r
s = req.getParameter("statusCode");\r
if (s != null) {\r
String sql = null;\r
if (type.equals("all") || type.equals("pub")) {\r
String sql = "select * from LOG_RECORDS where FEEDID = "+feedid\r
+ " AND TYPE = 'pub'"\r
- + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL");\r
+ + map.get("timeSQL") + map.get("publishSQL") + map.get("statusSQL") + map.get("filenameSQL");\r
getRecordsForSQL(sql, rh);\r
}\r
}\r