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

2831 refactor names of variables and methods used for correlation engine enabling to be more clear

Browse Source
This commit is contained in:
William Schaefer 2017-09-11 13:25:12 -04:00
parent b25fde5b3b
commit bd1390671d
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java
View File

@ -194,7 +194,7 @@ public class CaseEventListener implements PropertyChangeListener {
*/
if ((null == evt.getOldValue()) && (evt.getNewValue() instanceof Case)) {
Case curCase = (Case) evt.getNewValue();
IngestEventsListener.resetIngestJobCounter();
IngestEventsListener.resetCeModuleInstanceCount();
try {
// only add default evidence tag if case is open and it doesn't already exist in the tags list.
if (Case.isCaseOpen()

36
Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java
View File

@ -52,7 +52,7 @@ public class IngestEventsListener {
private static final Logger LOGGER = Logger.getLogger(EamArtifact.class.getName());
final Collection<String> addedCeArtifactTrackerSet = new LinkedHashSet<>();
private static long ingestJobCounter = 0;
private static long ceModuleInstanceCount = 0;
private final PropertyChangeListener pcl1 = new IngestModuleEventListener();
private final PropertyChangeListener pcl2 = new IngestJobEventListener();
@ -73,47 +73,47 @@ public class IngestEventsListener {
}
/**
* Enable this IngestEventsListener to add contents to the Central
* Repository.
* Enable this IngestEventsListener to add contents to the Correlation
* Engine.
*
*/
public synchronized static void enableCentralRepositoryModule() {
ingestJobCounter++; //Should be called once in the central repository module's startup method.
public synchronized static void enableCorrelationEngineModule() {
ceModuleInstanceCount++; //Should be called once in the Correlation Engine module's startup method.
}
/**
* Disable this IngestEventsListener from adding contents to the Central
* Repository.
* Disable this IngestEventsListener from adding contents to the Correlation
* Engine.
*/
public synchronized static void disableCentralRepositoryModule() {
if (isCentralRepositoryModuleEnabled()) { //prevent it ingestJobCounter from going negative
ingestJobCounter--; //Should be called once in the central repository module's shutdown method.
public synchronized static void disableCorrelationEngineModule() {
if (isCorrelationEngineModuleEnabled()) { //prevent it ingestJobCounter from going negative
ceModuleInstanceCount--; //Should be called once in the Correlation Engine module's shutdown method.
}
}
/**
* Reset the counter which keeps track of if the Central Repository Module
* Reset the counter which keeps track of if the Correlation Engine Module
* is being run during injest to 0.
*/
synchronized static void resetIngestJobCounter() {
ingestJobCounter = 0; //called when a case is opened in case for some reason counter was not reset
synchronized static void resetCeModuleInstanceCount() {
ceModuleInstanceCount = 0; //called when a case is opened in case for some reason counter was not reset
}
/**
* Wether or not the Central Repository Module is enabled for any of the
* Wether or not the Correlation Engine Module is enabled for any of the
* currently running ingest jobs.
*
* @return boolean True for Central Repo enabled, False for disabled
* @return boolean True for Correlation Engine enabled, False for disabled
*/
private synchronized static boolean isCentralRepositoryModuleEnabled() {
return ingestJobCounter > 0;
private synchronized static boolean isCorrelationEngineModuleEnabled() {
return ceModuleInstanceCount > 0;
}
private class IngestModuleEventListener implements PropertyChangeListener {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (isCentralRepositoryModuleEnabled()) {
if (isCorrelationEngineModuleEnabled()) {
EamDb dbManager;
try {
dbManager = EamDb.getInstance();

4
Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
View File

@ -156,7 +156,7 @@ class IngestModule implements FileIngestModule {
@Override
public void shutDown() {
IngestEventsListener.disableCentralRepositoryModule();
IngestEventsListener.disableCorrelationEngineModule();
if (EamDb.isEnabled() == false) {
/*
* Not signaling an error for now. This is a workaround for the way
@ -197,7 +197,7 @@ class IngestModule implements FileIngestModule {
})
@Override
public void startUp(IngestJobContext context) throws IngestModuleException {
IngestEventsListener.enableCentralRepositoryModule();
IngestEventsListener.enableCorrelationEngineModule();
if (EamDb.isEnabled() == false) {
/*
* Not throwing the customary exception for now. This is a