ElasticSearch Update #118
Merged
ElasticSearch Update #118
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Will retry until it can connect to the task db and load storage modules. Fixes mitre#74.
|
We should use the ElasticSearch recommended doc type of "_doc". From here: https://www.elastic.co/guide/en/elasticsearch/reference/6.x/removal-of-types.html |
Note that "doc" is still used when calling the update API because that's what ES expects: elastic/elasticsearch-py#649
This fixes a bug where API wouldn't work if the one storage module loaded wasn't ES.
ptcNOP
reviewed
Apr 23, 2018
| # Setup each enabled storage | ||
| self.load_modules() | ||
|
|
||
| def load_modules(self, required_module=""): |
There was a problem hiding this comment.
Does it make sense for this method to return a module sometimes and a dictionary others?
There was a problem hiding this comment.
I guess it only returns a module if required_module is set.
ptcNOP
reviewed
Apr 23, 2018
storage/storage.py
Outdated
|
|
||
| if storage_error: | ||
| if required_module: | ||
| sys.exit('ERROR: {} module not loaded!'.format(required_module)) |
There was a problem hiding this comment.
Maybe raise our own exception instead of SystemExit...?
|
I had a couple of comments about the new method, |
- Use a custom exception instead of sys.exit() - Use values from config file for task database - Ensure required storage module is ENABLED in the config - Make load_modules() always return the same type of object
|
I like these changes. This looks good to me. |
... since it's used by Elasticsearch but not helpful for the user and is always the same.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #64, fixes #74, fixes #117, fixes #120.