codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-02 15:29:54 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into mt-update

Browse Source 
Conflicts:
	Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
This commit is contained in:
Samuel H. Kenyon
2014-04-22 15:48:51 -04:00
parent 2de09e1914 1bd4d58e14
commit 30bb4ee6ae
206 changed files with 1748 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+6 -1
View File
@@ -60,6 +60,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import org.sleuthkit.datamodel.Content;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.common.SolrException;
/**
* Handles for keeping track of a Solr server and its cores
@@ -533,12 +534,16 @@ public class Server {
// probably caused by starting a connection as the server finishes
// shutting down)
if (cause instanceof ConnectException || cause instanceof SocketException) { //|| cause instanceof NoHttpResponseException) {
logger.log(Level.INFO, "Solr server is not running, cause: " + cause.getMessage());
logger.log(Level.INFO, "Solr server is not running, cause: {0}", cause.getMessage());
return false;
} else {
throw new KeywordSearchModuleException(
NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg"), ex);
}
} catch (SolrException ex) {
// Just log 404 errors for now...
logger.log(Level.INFO, "Solr server is not running", ex);
return false;
} catch (IOException ex) {
throw new KeywordSearchModuleException(
NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg2"), ex);