From 92306088e697fe2abe0c906e56136141e45913aa Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Thu, 25 Jun 2020 12:34:21 +0200 Subject: [PATCH] Event logs added --- .../publisher/lr62/action/PostLoginAction.java | 6 +++++- .../publisher/lr62/action/PreLogoutAction.java | 6 +++++- .../publisher/lr62/action/StartupAction.java | 5 +++-- .../lr62/model/GroupEventPublisher.java | 14 ++++++++++++-- .../publisher/lr62/model/UserEventPublisher.java | 14 ++++++++++++-- .../lr62/model/UserGroupRoleEventPublisher.java | 16 ++++++++++++---- 6 files changed, 49 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/action/PostLoginAction.java b/src/main/java/org/gcube/portal/event/publisher/lr62/action/PostLoginAction.java index 96c9471..6fee92f 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/action/PostLoginAction.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/action/PostLoginAction.java @@ -22,7 +22,11 @@ public class PostLoginAction extends Action { @Override public void run(HttpServletRequest request, HttpServletResponse response) throws ActionException { - eventPublisher.publish(ActionEvent.newLoginEvent(request, response)); + ActionEvent actionEvent = ActionEvent.newLoginEvent(request, response); + if (log.isDebugEnabled()) { + log.debug("ActionEvent is: " + actionEvent); + } + eventPublisher.publish(actionEvent); } } diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/action/PreLogoutAction.java b/src/main/java/org/gcube/portal/event/publisher/lr62/action/PreLogoutAction.java index 18d3818..c0968fd 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/action/PreLogoutAction.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/action/PreLogoutAction.java @@ -22,7 +22,11 @@ public class PreLogoutAction extends Action { @Override public void run(HttpServletRequest request, HttpServletResponse response) throws ActionException { - eventPublisher.publish(ActionEvent.newLogoutEvent(request, response)); + ActionEvent actionEvent = ActionEvent.newLogoutEvent(request, response); + if (log.isDebugEnabled()) { + log.debug("ActionEvent is: " + actionEvent); + } + eventPublisher.publish(actionEvent); } } diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/action/StartupAction.java b/src/main/java/org/gcube/portal/event/publisher/lr62/action/StartupAction.java index a6e63a8..73bbba6 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/action/StartupAction.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/action/StartupAction.java @@ -19,10 +19,11 @@ public class StartupAction extends SimpleAction { @Override public void run(String[] ids) throws ActionException { + SimpleActionEvent event = SimpleActionEvent.newStartupEvent(ids); if (log.isInfoEnabled()) { - log.info("Sending startup event"); + log.info("Sending startup event: " + event); } - eventPublisher.publish(SimpleActionEvent.newStartupEvent(ids)); + eventPublisher.publish(event); } } diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/model/GroupEventPublisher.java b/src/main/java/org/gcube/portal/event/publisher/lr62/model/GroupEventPublisher.java index 0d6af2d..ca09bab 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/model/GroupEventPublisher.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/model/GroupEventPublisher.java @@ -8,7 +8,12 @@ public class GroupEventPublisher extends AbstractEventPublisherBaseModelListener @Override public void onAfterCreate(Group group) throws ModelListenerException { if (group.isSite()) { - publish(GroupEvent.newCreatedEvent(group)); + log.info("Created a site Group"); + GroupEvent groupEvent = GroupEvent.newCreatedEvent(group); + if (log.isDebugEnabled()) { + log.debug("Group event is: " + groupEvent); + } + publish(groupEvent); } else { log.info("Created a non-site Group"); } @@ -17,7 +22,12 @@ public class GroupEventPublisher extends AbstractEventPublisherBaseModelListener @Override public void onBeforeRemove(Group group) throws ModelListenerException { if (group.isSite()) { - publish(GroupEvent.newDeletedEvent(group)); + log.info("Deleted a site Group"); + GroupEvent groupEvent = GroupEvent.newDeletedEvent(group); + if (log.isDebugEnabled()) { + log.debug("Group event is: " + groupEvent); + } + publish(groupEvent); } else { log.info("Deleted a non-site Group"); } diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserEventPublisher.java b/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserEventPublisher.java index 7975f6a..96dcf3c 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserEventPublisher.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserEventPublisher.java @@ -7,12 +7,22 @@ public class UserEventPublisher extends AbstractEventPublisherBaseModelListener< @Override public void onAfterCreate(User user) throws ModelListenerException { - publish(UserEvent.newCreatedEvent(user)); + log.info("New user created"); + UserEvent userEvent = UserEvent.newCreatedEvent(user); + if (log.isDebugEnabled()) { + log.debug("User event is: " + userEvent); + } + publish(userEvent); } @Override public void onBeforeRemove(User user) throws ModelListenerException { - publish(UserEvent.newDeletedEvent(user)); + log.info("User removed"); + UserEvent userEvent = UserEvent.newDeletedEvent(user); + if (log.isDebugEnabled()) { + log.debug("User event is: " + userEvent); + } + publish(userEvent); } /* Uninteresting model events */ diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserGroupRoleEventPublisher.java b/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserGroupRoleEventPublisher.java index f632181..0929d64 100644 --- a/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserGroupRoleEventPublisher.java +++ b/src/main/java/org/gcube/portal/event/publisher/lr62/model/UserGroupRoleEventPublisher.java @@ -13,10 +13,17 @@ public class UserGroupRoleEventPublisher extends AbstractEventPublisherBaseModel try { Group group = userGroupRole.getGroup(); if (group.isSite()) { - publish(UserGroupRoleEvent.newCreatedEvent(userGroupRole, userGroupRole.getUser(), group, - userGroupRole.getRole())); + log.info("Created a site user's group role"); + UserGroupRoleEvent event = UserGroupRoleEvent.newCreatedEvent(userGroupRole, userGroupRole.getUser(), + group, + userGroupRole.getRole()); + + if (log.isDebugEnabled()) { + log.debug("Event is: " + event); + } + publish(event); } else { - log.info("Created a non-site group's role"); + log.info("Created a non-site user's group role"); } } catch (PortalException | SystemException e) { log.error("Cannot get related model objects", e); @@ -29,10 +36,11 @@ public class UserGroupRoleEventPublisher extends AbstractEventPublisherBaseModel try { Group group = userGroupRole.getGroup(); if (group.isSite()) { + log.info("Deleted a site user's group role"); publish(UserGroupRoleEvent.newDeletedEvent(userGroupRole, userGroupRole.getUser(), group, userGroupRole.getRole())); } else { - log.info("Deleted a non-site group's role"); + log.info("Deleted a non-site user's group role"); } } catch (PortalException | SystemException e) { log.error("Cannot get related model objects", e);