diff --git a/venus/db/sqlalchemy/migrate_repo/versions/001_venus_init.py b/venus/db/sqlalchemy/migrate_repo/versions/001_venus_init.py index b05b982..0dc860d 100644 --- a/venus/db/sqlalchemy/migrate_repo/versions/001_venus_init.py +++ b/venus/db/sqlalchemy/migrate_repo/versions/001_venus_init.py @@ -71,7 +71,7 @@ def upgrade(migrate_engine): t_mo_custom_config.create(migrate_engine, checkfirst=True) new_data = { - 'id': 'es_index_length', + 'id': 'log_save_days', 'value': '30', 'update_time': '1900-01-01 00:00:00' } diff --git a/venus/modules/custom_config/controller.py b/venus/modules/custom_config/controller.py index c2751d1..29d7694 100644 --- a/venus/modules/custom_config/controller.py +++ b/venus/modules/custom_config/controller.py @@ -27,7 +27,7 @@ class CustomConfigController(wsgi.Controller): @wsgi.wrap_check_policy def get_config(self, req): result = dict() - result["log_save_days"] = self.config_api.get_config("es_index_length") + result["log_save_days"] = self.config_api.get_config("log_save_days") return result @wsgi.wrap_check_policy diff --git a/venus/task/core/delete_es_index_task.py b/venus/task/core/delete_es_index_task.py index 1f50b7c..db99352 100644 --- a/venus/task/core/delete_es_index_task.py +++ b/venus/task/core/delete_es_index_task.py @@ -42,11 +42,11 @@ class DeleteESIndexTask(object): return def delete_es_history_index(self): - len_d = self.config_api.get_config("es_index_length") + len_d = self.config_api.get_config("log_save_days") if len_d is None: - LOG.error(_LE("es_index_length no exist")) + LOG.error(_LE("the config of log_save_days do not exist")) return - LOG.info("the elasticsearch indexes keep days {}".format(len_d)) + LOG.info("the elasticsearch indexes(log) save days {}".format(len_d)) today = time.strftime('%Y-%m-%d') try: indexes_array = self.search_lib.get_all_index() @@ -73,5 +73,4 @@ class DeleteESIndexTask(object): self.delete_es_history_index() LOG.info(_LI("delete es index task done")) except Exception as e: - LOG.error(_LE("delete es index task, catch exception:%s"), - str(e)) + LOG.error(_LE("delete es index task, catch exception:%s"), str(e))