1
0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-02 19:55:51 +00:00
Commit Graph

1065 Commits

Author SHA1 Message Date
Samuel H. Kenyon
eb18e50bf4 Merge remote-tracking branch 'upstream/develop' into onemsg2 2014-04-09 17:36:08 -04:00
Samuel H. Kenyon
e9f6226b47 Merge remote-tracking branch 'upstream/develop' into mtsearch2b 2014-04-09 15:54:51 -04:00
Richard Cordovano
257214f178 Merge pull request #593 from SynapticNulship/mt-search
Search concurrency
2014-04-09 15:44:20 -04:00
Samuel H. Kenyon
b5d06e67ce simplify the loop in addKeywordListsToAllJobs() 2014-04-09 15:36:11 -04:00
Samuel H. Kenyon
0437977226 moved commit() up in stopJob() and removed some INFO logging 2014-04-09 15:30:45 -04:00
Samuel H. Kenyon
1e255f0979 SevenZipIngestModule: only check 7zip init once 2014-04-09 14:07:05 -04:00
Samuel H. Kenyon
b0b9e8201c FileExtMismatchIngestModule: only send one final message 2014-04-09 13:32:58 -04:00
Richard Cordovano
5b25aa1edd Removed unused imports, TODO comment 2014-04-09 11:15:20 -04:00
Richard Cordovano
a07153261e Changed ingest module lifecycle events to ingest job lifecycle events 2014-04-09 11:09:19 -04:00
Samuel H. Kenyon
d8d03aeae1 KeywordSearch: check the server and existence of keywords only once per job 2014-04-09 11:00:36 -04:00
Samuel H. Kenyon
000a70a7d9 Just do one summary postMessage for KeywordSearch module. 2014-04-08 17:48:21 -04:00
Samuel H. Kenyon
42e83d3b23 ingestStatus is now static and shared between all threads 2014-04-08 17:42:30 -04:00
Samuel H. Kenyon
3a5e00a6bc Merge branch 'mt-search2' into onemsg2
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-08 17:38:04 -04:00
Samuel H. Kenyon
ada3dd732b The renamed prop. 2014-04-08 16:49:51 -04:00
Samuel H. Kenyon
e76573ee8a Adding the missing bundle properties to this branch since my pull request to develop is still waiting. 2014-04-08 16:42:01 -04:00
Samuel H. Kenyon
bb29624635 Make the ctor synchronized 2014-04-08 16:05:27 -04:00
Samuel H. Kenyon
97b724350f Extra log info 2014-04-08 16:05:13 -04:00
Samuel H. Kenyon
94e8bb1c95 Some naming cleanup. 2014-04-08 15:42:59 -04:00
Samuel H. Kenyon
c22b67d125 Merge remote-tracking branch 'upstream/develop' into mt-search2 2014-04-08 12:27:27 -04:00
Brian Carrier
61d09a9627 changed SOLR launching messages to ERROR instead of WARNING 2014-04-07 22:36:55 -04:00
Samuel H. Kenyon
652ff6d306 Give the timer daemon a name (useful for debugging). 2014-04-07 13:32:44 -04:00
Samuel H. Kenyon
98593fe7b1 More thread-safe 2014-04-04 18:37:42 -04:00
Samuel H. Kenyon
f6f5ad7002 Some cleanup and an extra logging statement. 2014-04-04 18:37:18 -04:00
Samuel H. Kenyon
3a28422f5f Remove initialized variable 2014-04-04 17:59:48 -04:00
Samuel H. Kenyon
8248bf66e7 Give each job a finalSearchLock so that one job doesn't interfere with another. 2014-04-04 17:58:52 -04:00
Samuel H. Kenyon
44d11e1862 Comments, logging, and changed ingester lock. 2014-04-04 17:31:28 -04:00
Samuel H. Kenyon
ea19685e3e extractors changed to non-static 2014-04-04 14:59:35 -04:00
Samuel H. Kenyon
341fbfc94e Use a util timer set as a daemon, not a swing timer. 2014-04-04 14:59:05 -04:00
Samuel H. Kenyon
92f12e8ce0 Merge remote-tracking branch 'upstream/develop' into mt-search
Conflicts:
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
2014-04-04 13:49:46 -04:00
Samuel H. Kenyon
109cd14c98 Remove messageID tracking and passing from modules as class IngestMessage handles it automatically now 2014-04-03 22:49:17 -04:00
Samuel H. Kenyon
66a53a3f06 Eyeball widget now sends new lists to ingest jobs via the SearchRunner singleton. 2014-04-03 19:15:17 -04:00
Samuel H. Kenyon
7913ecf25d Only do final search if this is the last module in this job to call endJob() 2014-04-03 17:25:23 -04:00
Samuel H. Kenyon
5a77a3102e Move notify into the final finally(). 2014-04-03 16:16:45 -04:00
Samuel H. Kenyon
a5c4b9d518 Adjust final search condition/wait to use its own lock object. 2014-04-03 15:56:42 -04:00
Samuel H. Kenyon
b16dfba6b9 Add colon and trailing space to some of the bundle props 2014-04-03 15:55:03 -04:00
Samuel H. Kenyon
799208c2f7 Missing strings added to Bundle.properties 2014-04-03 13:59:51 -04:00
Samuel H. Kenyon
5b7c84d366 Get jobID from IngestJobContext arg 2014-04-03 13:38:53 -04:00
Samuel H. Kenyon
ad66136011 Placeholders for missing bundle properties. 2014-04-02 20:19:30 -04:00
Samuel H. Kenyon
6ae82a69bc Fix bundle names. 2014-04-02 19:19:13 -04:00
Samuel H. Kenyon
44837e905f Remove calls to module.checkRunCommitSearch(). 2014-04-02 18:53:59 -04:00
Samuel H. Kenyon
004b22ffc2 Remove unused imports 2014-04-02 17:31:06 -04:00
Samuel H. Kenyon
977d47fdf9 Keep track of current searcher refs and cancel them in stop(). 2014-04-02 17:26:44 -04:00
Samuel H. Kenyon
bafbd19ade Remove stuff from KeywordSearchIngestModule that is now in SearchRunner, and add calls to SearchRunner. 2014-04-01 18:21:00 -04:00
Samuel H. Kenyon
3ebe81c6fa A bit of cleanup 2014-04-01 17:27:23 -04:00
Samuel H. Kenyon
93e466a0b6 doFinalSearch() should now wait if the given job still has a search worker running before launching the final search worker. 2014-04-01 16:40:16 -04:00
Samuel H. Kenyon
2c006bec7d Don't start a new worker if the workerRunning flag is set 2014-04-01 16:15:43 -04:00
Samuel H. Kenyon
d7f255044c Concurrency refactoring; SearchJobInfo now controls currentResults. 2014-04-01 15:41:56 -04:00
Samuel H. Kenyon
a5d5691b16 Don't start a searcher thread unless that job has keyword lists. 2014-04-01 14:57:27 -04:00
Samuel H. Kenyon
d962156730 Merge branch 'keyword_option_gui' into mt-search 2014-04-01 12:30:54 -04:00
Samuel H. Kenyon
2d96ccea92 Fix sizing issues in the KeywordSearch advanced options GUI. 2014-04-01 12:26:07 -04:00