X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_common%2Fdbmongo.py;h=f5c4d3055d9e95c70194b7e2eac10b52b01df184;hb=eebe8f521c19c73762e3678857a001ad0267e1e2;hp=d8b373a47783d9b853549ca1d1c9009aac680f04;hpb=2644b76248a1b96f7a47013b414e31b4e3feecf8;p=osm%2Fcommon.git diff --git a/osm_common/dbmongo.py b/osm_common/dbmongo.py index d8b373a..f5c4d30 100644 --- a/osm_common/dbmongo.py +++ b/osm_common/dbmongo.py @@ -16,15 +16,16 @@ # limitations under the License. -import logging -from pymongo import MongoClient, errors -from osm_common.dbbase import DbException, DbBase -from http import HTTPStatus -from time import time, sleep -from copy import deepcopy from base64 import b64decode +from copy import deepcopy +from http import HTTPStatus +import logging +from time import sleep, time from uuid import uuid4 +from osm_common.dbbase import DbBase, DbException +from pymongo import errors, MongoClient + __author__ = "Alfonso Tierno " # TODO consider use this decorator for database access retries @@ -64,7 +65,7 @@ class DbMongo(DbBase): conn_timout = 10 def __init__(self, logger_name="db", lock=False): - super().__init__(logger_name, lock) + super().__init__(logger_name=logger_name, lock=lock) self.client = None self.db = None self.database_key = None @@ -104,13 +105,6 @@ class DbMongo(DbBase): self.client = MongoClient( config["uri"], replicaSet=config.get("replicaset", None) ) - else: - self.client = MongoClient( - config["host"], - config["port"], - replicaSet=config.get("replicaset", None), - ) - # TODO add as parameters also username=config.get("user"), password=config.get("password")) # when all modules are ready self.db = self.client[config["name"]] if "loglevel" in config: