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

Merge pull request #1984 from eugene7646/remote_publisher

Browse Source 
Bug fix and a catch-all exception firewall
This commit is contained in:
Richard Cordovano 2016-02-24 15:35:01 -05:00
commit 9ffb2fe797
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java
View File

@ -168,10 +168,14 @@ public final class AutopsyEventPublisher {
if (null != currentChannelName) { if (null != currentChannelName) {
boolean published = false; boolean published = false;
int tryCount = 1; int tryCount = 1;
/* We need to store the original channel name in case we want to re-try
opening a channel with same name.
*/
String originalChannelName = currentChannelName;
while (false == published && tryCount <= MAX_REMOTE_EVENT_PUBLISH_TRIES) { while (false == published && tryCount <= MAX_REMOTE_EVENT_PUBLISH_TRIES) {
try { try {
if (null == remotePublisher) { if (null == remotePublisher) {
openRemoteEventChannel(currentChannelName); openRemoteEventChannel(originalChannelName);
} }
remotePublisher.publish(event); remotePublisher.publish(event);
published = true; published = true;
@ -180,7 +184,10 @@ public final class AutopsyEventPublisher {
closeRemoteEventChannel(); closeRemoteEventChannel();
++tryCount; ++tryCount;
} catch (AutopsyEventException ex) { } catch (AutopsyEventException ex) {
logger.log(Level.SEVERE, String.format("Failed to reopen channel %s to publish %s event (tryCount = %s)", currentChannelName, event.getPropertyName(), tryCount), ex); //NON-NLS logger.log(Level.SEVERE, String.format("Failed to reopen channel %s to publish %s event (tryCount = %s)", originalChannelName, event.getPropertyName(), tryCount), ex); //NON-NLS
++tryCount;
} catch (Exception ex) {
logger.log(Level.SEVERE, String.format("Unexpected exception! Failed to to publish %s event on channel %s (tryCount = %s)", event.getPropertyName(), originalChannelName, tryCount), ex); //NON-NLS
++tryCount; ++tryCount;
} }
} }