Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cmreslogging/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ class IndexNameFrequency(Enum):
- Weekly indices
- Monthly indices
- Year indices
- Append to one index
"""
DAILY = 0
WEEKLY = 1
MONTHLY = 2
YEARLY = 3
NONE = 4

# Defaults for the class
__DEFAULT_ELASTICSEARCH_HOST = [{'host': 'localhost', 'port': 9200}]
Expand Down Expand Up @@ -115,11 +117,20 @@ def _get_yearly_index_name(es_index_name):
"""
return "{0!s}-{1!s}".format(es_index_name, datetime.datetime.now().strftime('%Y'))

@staticmethod
def _get_base_index_name(es_index_name):
""" Return elasticsearch index name
:param: index_name the prefix to be used in the index
:return: A srting containing the elasticsearch indexname used which should not include the date in any format
"""
return es_index_name

_INDEX_FREQUENCY_FUNCION_DICT = {
IndexNameFrequency.DAILY: _get_daily_index_name,
IndexNameFrequency.WEEKLY: _get_weekly_index_name,
IndexNameFrequency.MONTHLY: _get_monthly_index_name,
IndexNameFrequency.YEARLY: _get_yearly_index_name
IndexNameFrequency.YEARLY: _get_yearly_index_name,
IndexNameFrequency.NONE: _get_base_index_name,
}

def __init__(self,
Expand Down
10 changes: 10 additions & 0 deletions tests/test_cmreshandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,16 @@ def test_index_name_frequency_functions(self):
CMRESHandler._get_yearly_index_name(index_name)
)

handler = CMRESHandler(hosts=[{'host': self.getESHost(), 'port': self.getESPort()}],
auth_type=CMRESHandler.AuthType.NO_AUTH,
es_index_name=index_name,
index_name_frequency=CMRESHandler.IndexNameFrequency.NONE,
raise_on_indexing_exceptions=True)
self.assertEqual(
handler._index_name_func.__func__(index_name),
CMRESHandler._get_base_index_name(index_name)
)


if __name__ == '__main__':
unittest.main()