Skip to content
GitLab
Commit 8281b079 authored by Greg Messner's avatar Greg Messner
Browse files

Mods to use shared Logger from GitLabApi class (#228).

parent 4eb856c7
Hide whitespace changes
Inline Side-by-side
src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
View file @ 8281b079
...@@ -9,6 +9,7 @@ import java.util.logging.Logger; ...@@ -9,6 +9,7 @@ import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.HookManager; import org.gitlab4j.api.HookManager;
import org.gitlab4j.api.utils.HttpRequestUtils; import org.gitlab4j.api.utils.HttpRequestUtils;
...@@ -21,7 +22,7 @@ public class SystemHookManager extends HookManager { ...@@ -21,7 +22,7 @@ public class SystemHookManager extends HookManager {
public static final String SYSTEM_HOOK_EVENT = "System Hook"; public static final String SYSTEM_HOOK_EVENT = "System Hook";
private final static Logger LOG = Logger.getLogger(SystemHookManager.class.getName()); private final static Logger LOGGER = GitLabApi.getLogger();
private final JacksonJson jacksonJson = new JacksonJson(); private final JacksonJson jacksonJson = new JacksonJson();
// Collection of objects listening for System Hook events. // Collection of objects listening for System Hook events.
...@@ -55,27 +56,27 @@ public class SystemHookManager extends HookManager { ...@@ -55,27 +56,27 @@ public class SystemHookManager extends HookManager {
if (!isValidSecretToken(request)) { if (!isValidSecretToken(request)) {
String message = "X-Gitlab-Token mismatch!"; String message = "X-Gitlab-Token mismatch!";
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
String eventName = request.getHeader("X-Gitlab-Event"); String eventName = request.getHeader("X-Gitlab-Event");
LOG.info("handleEvent: X-Gitlab-Event=" + eventName); LOGGER.info("handleEvent: X-Gitlab-Event=" + eventName);
if (!SYSTEM_HOOK_EVENT.equals(eventName)) { if (!SYSTEM_HOOK_EVENT.equals(eventName)) {
String message = "Unsupported X-Gitlab-Event, event Name=" + eventName; String message = "Unsupported X-Gitlab-Event, event Name=" + eventName;
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
try { try {
SystemHookEvent event; SystemHookEvent event;
if (LOG.isLoggable(Level.FINE)) { if (LOGGER.isLoggable(Level.FINE)) {
LOG.fine(HttpRequestUtils.getShortRequestDump("System Hook", true, request)); LOGGER.fine(HttpRequestUtils.getShortRequestDump("System Hook", true, request));
String postData = HttpRequestUtils.getPostDataAsString(request); String postData = HttpRequestUtils.getPostDataAsString(request);
LOG.fine("Raw POST data:\n" + postData); LOGGER.fine("Raw POST data:\n" + postData);
event = jacksonJson.unmarshal(SystemHookEvent.class, postData); event = jacksonJson.unmarshal(SystemHookEvent.class, postData);
LOG.fine(event.getEventName() + "\n" + jacksonJson.marshal(event) + "\n"); LOGGER.fine(event.getEventName() + "\n" + jacksonJson.marshal(event) + "\n");
} else { } else {
InputStreamReader reader = new InputStreamReader(request.getInputStream()); InputStreamReader reader = new InputStreamReader(request.getInputStream());
event = jacksonJson.unmarshal(SystemHookEvent.class, reader); event = jacksonJson.unmarshal(SystemHookEvent.class, reader);
...@@ -84,7 +85,7 @@ public class SystemHookManager extends HookManager { ...@@ -84,7 +85,7 @@ public class SystemHookManager extends HookManager {
fireEvent(event); fireEvent(event);
} catch (Exception e) { } catch (Exception e) {
LOG.warning("Error processing JSON data, exception=" + LOGGER.warning("Error processing JSON data, exception=" +
e.getClass().getSimpleName() + ", error=" + e.getMessage()); e.getClass().getSimpleName() + ", error=" + e.getMessage());
throw new GitLabApiException(e); throw new GitLabApiException(e);
} }
...@@ -98,10 +99,10 @@ public class SystemHookManager extends HookManager { ...@@ -98,10 +99,10 @@ public class SystemHookManager extends HookManager {
*/ */
public void handleEvent(SystemHookEvent event) throws GitLabApiException { public void handleEvent(SystemHookEvent event) throws GitLabApiException {
if (event != null) { if (event != null) {
LOG.info("handleEvent:" + event.getClass().getSimpleName() + ", eventName=" + event.getEventName()); LOGGER.info("handleEvent:" + event.getClass().getSimpleName() + ", eventName=" + event.getEventName());
fireEvent(event); fireEvent(event);
} else { } else {
LOG.warning("handleEvent: provided event cannot be null!"); LOGGER.warning("handleEvent: provided event cannot be null!");
} }
} }
...@@ -154,7 +155,7 @@ public class SystemHookManager extends HookManager { ...@@ -154,7 +155,7 @@ public class SystemHookManager extends HookManager {
fireRepositoryEvent((RepositorySystemHookEvent) event); fireRepositoryEvent((RepositorySystemHookEvent) event);
} else { } else {
String message = "Unsupported event, event_named=" + event.getEventName(); String message = "Unsupported event, event_named=" + event.getEventName();
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
} }
......
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
View file @ 8281b079
...@@ -9,6 +9,7 @@ import java.util.logging.Logger; ...@@ -9,6 +9,7 @@ import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GitLabApiException; import org.gitlab4j.api.GitLabApiException;
import org.gitlab4j.api.HookManager; import org.gitlab4j.api.HookManager;
import org.gitlab4j.api.utils.HttpRequestUtils; import org.gitlab4j.api.utils.HttpRequestUtils;
...@@ -19,7 +20,7 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -19,7 +20,7 @@ import org.gitlab4j.api.utils.JacksonJson;
*/ */
public class WebHookManager extends HookManager { public class WebHookManager extends HookManager {
private final static Logger LOG = Logger.getLogger(WebHookManager.class.getName()); private final static Logger LOGGER = GitLabApi.getLogger();
private final JacksonJson jacksonJson = new JacksonJson(); private final JacksonJson jacksonJson = new JacksonJson();
// Collection of objects listening for WebHook events. // Collection of objects listening for WebHook events.
...@@ -53,12 +54,12 @@ public class WebHookManager extends HookManager { ...@@ -53,12 +54,12 @@ public class WebHookManager extends HookManager {
if (!isValidSecretToken(request)) { if (!isValidSecretToken(request)) {
String message = "X-Gitlab-Token mismatch!"; String message = "X-Gitlab-Token mismatch!";
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
String eventName = request.getHeader("X-Gitlab-Event"); String eventName = request.getHeader("X-Gitlab-Event");
LOG.info("handleEvent: X-Gitlab-Event=" + eventName); LOGGER.info("handleEvent: X-Gitlab-Event=" + eventName);
switch (eventName) { switch (eventName) {
case BuildEvent.BUILD_HOOK_X_GITLAB_EVENT: case BuildEvent.BUILD_HOOK_X_GITLAB_EVENT:
...@@ -74,19 +75,19 @@ public class WebHookManager extends HookManager { ...@@ -74,19 +75,19 @@ public class WebHookManager extends HookManager {
default: default:
String message = "Unsupported X-Gitlab-Event, event Name=" + eventName; String message = "Unsupported X-Gitlab-Event, event Name=" + eventName;
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
try { try {
Event event; Event event;
if (LOG.isLoggable(Level.FINE)) { if (LOGGER.isLoggable(Level.FINE)) {
LOG.fine(HttpRequestUtils.getShortRequestDump(eventName + " webhook", true, request)); LOGGER.fine(HttpRequestUtils.getShortRequestDump(eventName + " webhook", true, request));
String postData = HttpRequestUtils.getPostDataAsString(request); String postData = HttpRequestUtils.getPostDataAsString(request);
LOG.fine("Raw POST data:\n" + postData); LOGGER.fine("Raw POST data:\n" + postData);
event = jacksonJson.unmarshal(Event.class, postData); event = jacksonJson.unmarshal(Event.class, postData);
LOG.fine(event.getObjectKind() + " event:\n" + jacksonJson.marshal(event) + "\n"); LOGGER.fine(event.getObjectKind() + " event:\n" + jacksonJson.marshal(event) + "\n");
} else { } else {
InputStreamReader reader = new InputStreamReader(request.getInputStream()); InputStreamReader reader = new InputStreamReader(request.getInputStream());
event = jacksonJson.unmarshal(Event.class, reader); event = jacksonJson.unmarshal(Event.class, reader);
...@@ -95,7 +96,7 @@ public class WebHookManager extends HookManager { ...@@ -95,7 +96,7 @@ public class WebHookManager extends HookManager {
fireEvent(event); fireEvent(event);
} catch (Exception e) { } catch (Exception e) {
LOG.warning("Error parsing JSON data, exception=" + e.getClass().getSimpleName() + ", error=" + e.getMessage()); LOGGER.warning("Error parsing JSON data, exception=" + e.getClass().getSimpleName() + ", error=" + e.getMessage());
throw new GitLabApiException(e); throw new GitLabApiException(e);
} }
} }
...@@ -108,7 +109,7 @@ public class WebHookManager extends HookManager { ...@@ -108,7 +109,7 @@ public class WebHookManager extends HookManager {
*/ */
public void handleEvent(Event event) throws GitLabApiException { public void handleEvent(Event event) throws GitLabApiException {
LOG.info("handleEvent: object_kind=" + event.getObjectKind()); LOGGER.info("handleEvent: object_kind=" + event.getObjectKind());
switch (event.getObjectKind()) { switch (event.getObjectKind()) {
case BuildEvent.OBJECT_KIND: case BuildEvent.OBJECT_KIND:
...@@ -123,7 +124,7 @@ public class WebHookManager extends HookManager { ...@@ -123,7 +124,7 @@ public class WebHookManager extends HookManager {
default: default:
String message = "Unsupported event object_kind, object_kind=" + event.getObjectKind(); String message = "Unsupported event object_kind, object_kind=" + event.getObjectKind();
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
...@@ -194,7 +195,7 @@ public class WebHookManager extends HookManager { ...@@ -194,7 +195,7 @@ public class WebHookManager extends HookManager {
default: default:
String message = "Unsupported event object_kind, object_kind=" + event.getObjectKind(); String message = "Unsupported event object_kind, object_kind=" + event.getObjectKind();
LOG.warning(message); LOGGER.warning(message);
throw new GitLabApiException(message); throw new GitLabApiException(message);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment