mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/custom-release-may-2018' into develop

Browse Source
This commit is contained in:
Richard Cordovano 2018-05-23 12:35:39 -04:00
commit 2f16a197b1
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java
View File

@ -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();

2
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java
View File

@ -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();
}

22
Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeControlEvent.java
View File

@ -36,17 +36,29 @@ final class AutoIngestNodeControlEvent extends AutopsyEvent implements Serializa
}
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() {