gCubeSystem
/
event-publisher-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rationalized logs

This commit is contained in:
Mauro Mugnaini 2020-07-03 17:33:57 +02:00
parent af3c099fd5
commit 2d74631416
1 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/org/gcube/event/publisher/HTTPEventSender.java
View File

@ -30,9 +30,7 @@ public class HTTPEventSender implements EventSender {
@Override
public void send(Event event) {
if (log.isDebugEnabled()) {
log.debug("Starting HTTP POST thread to: " + baseEnndpointURL);
}
log.debug("Starting HTTP POST thread to: {}", baseEnndpointURL);
try {
URL eventEndpoint = new URL(baseEnndpointURL, event.getName());
new Thread(new HTTPost(eventEndpoint, event.toJSONString())).start();
@ -58,59 +56,40 @@ public class HTTPEventSender implements EventSender {
@Override
public void run() {
try {
if (log.isDebugEnabled()) {
log.debug("Getting OIDC token for client: " + clientId);
}
log.debug("Getting OIDC token for client: {}", clientId);
JWTToken token = null;
if (clientId != null && clientSecret != null && tokenURL != null) {
if (log.isDebugEnabled()) {
log.debug("Getting OIDC token for clientId '" + clientId + "' from: " + tokenURL);
}
log.debug("Getting OIDC token for clientId '{}' from: {}", clientId, tokenURL);
token = OpenIdConnectRESTHelper.queryClientToken(clientId, clientSecret, tokenURL);
}
if (log.isDebugEnabled()) {
log.debug("Performing HTTP POST to: " + endpoint);
}
log.debug("Performing HTTP POST to: {}", endpoint);
HttpURLConnection connection = (HttpURLConnection) endpoint.openConnection();
connection.setRequestMethod("POST");
connection.setConnectTimeout(CONNECTION_TIMEOUT);
if (log.isTraceEnabled()) {
log.trace("HTTP connection timeout set to: " + connection.getConnectTimeout());
}
log.trace("HTTP connection timeout set to: {}", connection.getConnectTimeout());
connection.setReadTimeout(READ_TIMEOUT);
if (log.isTraceEnabled()) {
log.trace("HTTP connection Read timeout set to: " + connection.getReadTimeout());
}
log.trace("HTTP connection Read timeout set to: {}", connection.getReadTimeout());
connection.setRequestProperty("Content-Type", "application/json");
// Commented out as per the Conductor issue: https://github.com/Netflix/conductor/issues/376
// connection.setRequestProperty("Accept", "application/json");
connection.setDoOutput(true);
if (token != null) {
if (log.isDebugEnabled()) {
log.debug("Setting authorization header as: " + token.getAsBearer());
}
log.debug("Setting authorization header as: {}", token.getAsBearer());
connection.setRequestProperty("Authorization", token.getAsBearer());
} else {
if (log.isDebugEnabled()) {
log.debug("Sending request without authorization header");
}
log.debug("Sending request without authorization header");
}
OutputStream os = connection.getOutputStream();
if (log.isTraceEnabled()) {
log.trace("Sending event JSON: " + jsonString);
}
log.trace("Sending event JSON: {}", jsonString);
os.write(jsonString.getBytes("UTF-8"));
os.flush();
os.close();
StringBuilder sb = new StringBuilder();
int httpResultCode = connection.getResponseCode();
if (log.isTraceEnabled()) {
log.trace("HTTP Response code: " + httpResultCode);
}
if (log.isTraceEnabled()) {
log.trace("Reading response");
}
log.trace("HTTP Response code: {}", httpResultCode);
log.trace("Reading response");
boolean ok = true;
InputStreamReader isr = null;
if (httpResultCode == HttpURLConnection.HTTP_OK) {
@ -127,11 +106,9 @@ public class HTTPEventSender implements EventSender {
br.close();
isr.close();
if (ok) {
if (log.isDebugEnabled()) {
log.debug("[" + httpResultCode + "] Event publish OK. Results: " + sb.toString());
}
log.debug("[{}] Event publish OK. Results: {}", httpResultCode, sb.toString());
} else {
log.warn("[" + httpResultCode + "] Event publish is not OK. Results: " + sb.toString());
log.warn("[{}] Event publish is not OK. Results: {}", httpResultCode, sb.toString());
}
} catch (Exception e) {
log.error("POSTing JSON to: " + endpoint, e);