diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java index d43db389fd..9040c63709 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java @@ -453,7 +453,8 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen } private void handleRemoteNodeControlEvent(AutoIngestNodeControlEvent event) { - if (event.getNodeName().compareToIgnoreCase(LOCAL_HOST_NAME) == 0) { + if (event.getTargetNodeName().compareToIgnoreCase(LOCAL_HOST_NAME) == 0) { + sysLogger.log(Level.INFO, "Received {0} event from user {1} on machine {2}", new Object[] {event.getControlEventType().toString(), event.getUserName(), event.getOriginatingNodeName()}); switch (event.getControlEventType()) { case PAUSE: pause(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java index 09e6d1a861..4e262c738a 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java @@ -666,7 +666,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen */ private void sendControlEventToNode(ControlEventType eventType, String nodeName) { new Thread(() -> { - eventPublisher.publishRemotely(new AutoIngestNodeControlEvent(eventType, nodeName)); + eventPublisher.publishRemotely(new AutoIngestNodeControlEvent(eventType, nodeName, LOCAL_HOST_NAME, System.getProperty("user.name"))); }).start(); } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeControlEvent.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeControlEvent.java index ca16a2bf8b..e9f63cc434 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeControlEvent.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeControlEvent.java @@ -34,21 +34,33 @@ final class AutoIngestNodeControlEvent extends AutopsyEvent implements Serializa RESUME, SHUTDOWN } - + private static final long serialVersionUID = 1L; - private final String nodeName; + private final String targetNodeName; + private final String originatingNodeName; + private final String userName; private final ControlEventType eventType; - AutoIngestNodeControlEvent(ControlEventType eventType, String nodeName) { + AutoIngestNodeControlEvent(ControlEventType eventType, String targetNode, String originatingNode, String userName) { super(eventType.toString(), null, null); this.eventType = eventType; - this.nodeName = nodeName; + this.targetNodeName = targetNode; + this.originatingNodeName = originatingNode; + this.userName = userName; } - - String getNodeName() { - return nodeName; + + String getTargetNodeName() { + return targetNodeName; } - + + String getOriginatingNodeName() { + return originatingNodeName; + } + + String getUserName() { + return userName; + } + ControlEventType getControlEventType() { return eventType; }