diff --git a/venus/task/adapter.py b/venus/task/adapter.py index aa56ae7..646e0c2 100644 --- a/venus/task/adapter.py +++ b/venus/task/adapter.py @@ -13,11 +13,10 @@ # under the License. """A Timer Task With APScheduler.""" -from oslo_config import cfg + from oslo_log import log as logging from venus.task.core import delete_es_index_task -CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/venus/task/backends/models.py b/venus/task/backends/models.py index 135b7d3..d2886b8 100644 --- a/venus/task/backends/models.py +++ b/venus/task/backends/models.py @@ -16,13 +16,12 @@ SQLAlchemy models for venus data. """ -from oslo_config import cfg from oslo_db.sqlalchemy import models from oslo_utils import timeutils from sqlalchemy import Column from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import DateTime, String -CONF = cfg.CONF +from venus.conf import CONF BASE = declarative_base() diff --git a/venus/task/backends/sql.py b/venus/task/backends/sql.py index 553d195..ff5bc6c 100644 --- a/venus/task/backends/sql.py +++ b/venus/task/backends/sql.py @@ -16,16 +16,15 @@ import socket import time -from oslo_config import cfg from oslo_db import options from oslo_log import log as logging +from venus.conf import CONF from venus.db.common import _create_facade_lazily from venus.i18n import _LE from venus.task.backends import models # abc -CONF = cfg.CONF CONF.import_group("profiler", "venus.service") log = logging.getLogger(__name__) options.set_defaults(CONF, connection='sqlite:///$state_path/venus.sqlite') diff --git a/venus/task/core/delete_es_index_task.py b/venus/task/core/delete_es_index_task.py index 3513663..de4325b 100644 --- a/venus/task/core/delete_es_index_task.py +++ b/venus/task/core/delete_es_index_task.py @@ -16,17 +16,18 @@ import datetime import six import time -from oslo_config import cfg + from oslo_log import log as logging from venus.common import utils +from venus.conf import CONF from venus.modules.custom_config.backends.sql import CustomConfigSql from venus.modules.search.search_lib import ESSearchObj from venus.i18n import _LE, _LI from venus.task.backends.sql import TaskSql -CONF = cfg.CONF + LOG = logging.getLogger(__name__) TASK_NAME = "delete_es_index" diff --git a/venus/task/timer.py b/venus/task/timer.py index ac2b4d5..a272810 100644 --- a/venus/task/timer.py +++ b/venus/task/timer.py @@ -14,12 +14,10 @@ """A Timer Task With APScheduler.""" from apscheduler.schedulers.blocking import BlockingScheduler -from oslo_config import cfg from oslo_log import log as logging from venus.task import adapter LOG = logging.getLogger(__name__) -CONF = cfg.CONF sched = BlockingScheduler()