\r
private static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.dmaap-dr.subscription-control";\r
//Adding EELF Logger Rally:US664892\r
- private static EELFLogger eelflogger = EELFManager.getInstance()\r
+ private static EELFLogger eelfLogger = EELFManager.getInstance()\r
.getLogger(SubscriptionServlet.class);\r
\r
/**\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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
EventLogRecord elr = new EventLogRecord(req);\r
String message = isAuthorizedForProvisioning(req);\r
if (message != null) {\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "Missing " + BEHALF_HEADER + " header.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
return;\r
}\r
message = "Policy Engine disallows access.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "AAF disallows access to permission - " + permission;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
activeSubs--;\r
// send response\r
elr.setResult(HttpServletResponse.SC_NO_CONTENT);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
resp.setStatus(HttpServletResponse.SC_NO_CONTENT);\r
provisioningDataChanged();\r
} else {\r
// Something went wrong with the DELETE\r
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
}\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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
EventLogRecord elr = new EventLogRecord(req);\r
String message = isAuthorizedForProvisioning(req);\r
if (message != null) {\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "Missing " + BEHALF_HEADER + " header.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
return;\r
}\r
message = "Policy Engine disallows access.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
\r
// send response\r
elr.setResult(HttpServletResponse.SC_OK);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
resp.setStatus(HttpServletResponse.SC_OK);\r
resp.setContentType(SUBFULL_CONTENT_TYPE);\r
try {\r
eventlogger.error("IOException: " + ioe.getMessage());\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_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+ eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
EventLogRecord elr = new EventLogRecord(req);\r
String message = isAuthorizedForProvisioning(req);\r
if (message != null) {\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "Missing " + BEHALF_HEADER + " header.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
return;\r
}\r
message = "Incorrect content-type";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
return;\r
}\r
message = "Badly formed JSON";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = e.getMessage();\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Policy Engine disallows access.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "AAF disallows access to permission - " + permission;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "This subscriber must be modified by the same subscriber that created it.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
if (doUpdate(sub)) {\r
// send response\r
elr.setResult(HttpServletResponse.SC_OK);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
resp.setStatus(HttpServletResponse.SC_OK);\r
resp.setContentType(SUBFULL_CONTENT_TYPE);\r
try {\r
} else {\r
// Something went wrong with the UPDATE\r
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
}\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
\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
EventLogRecord elr = new EventLogRecord(req);\r
String message = isAuthorizedForProvisioning(req);\r
if (message != null) {\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "Missing " + BEHALF_HEADER + " header.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Missing or bad subscription number.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
message = "Incorrect content-type";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
return;\r
}\r
message = "Policy Engine disallows access.";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
return;\r
}\r
message = "Badly formed JSON";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
return;\r
}\r
}\r
// send response\r
elr.setResult(HttpServletResponse.SC_ACCEPTED);\r
- eventlogger.info(elr);\r
+ eventlogger.info(elr.toString());\r
resp.setStatus(HttpServletResponse.SC_ACCEPTED);\r
} catch (JSONException e) {\r
message = "Badly formed JSON";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
- eventlogger.info(elr);\r
+ eventlogger.error(elr.toString());\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
}\r
} finally {\r
- eelflogger.info(EelfMsgs.EXIT);\r
+ eelfLogger.info(EelfMsgs.EXIT);\r
}\r
}\r
\r
}\r
}\r
} catch (Exception e) {\r
- intlogger.warn("Caught exception in SubscriberNotifyThread: " + e);\r
+ intlogger.warn("Caught exception in SubscriberNotifyThread: " + e.getMessage());\r
}\r
}\r
}\r