url to uri

[osm/common.git] / osm_common / dbmongo.py

diff --git a/osm_common/dbmongo.py b/osm_common/dbmongo.py
index af63d5b..57ce082 100644 (file)
--- a/osm_common/dbmongo.py
+++ b/osm_common/dbmongo.py
@@ -62,8 +62,8 @@ class DbMongo(DbBase):
     conn_initial_timout = 120
     conn_timout = 10
 
-    def __init__(self, logger_name='db', master_password=None):
-        super().__init__(logger_name, master_password)
+    def __init__(self, logger_name='db', lock=False):
+        super().__init__(logger_name, lock)
         self.client = None
         self.db = None
 
@@ -77,7 +77,15 @@ class DbMongo(DbBase):
         try:
             if "logger_name" in config:
                 self.logger = logging.getLogger(config["logger_name"])
-            self.client = MongoClient(config["host"], config["port"])
+            master_key = config.get("commonkey") or config.get("masterpassword")
+            if master_key:
+                self.set_secret_key(master_key)
+            if config.get("uri"):
+                self.client = MongoClient(config["uri"])
+            else:
+                self.client = MongoClient(config["host"], config["port"])
+            # 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:
                 self.logger.setLevel(getattr(logging, config['loglevel']))
@@ -201,9 +209,10 @@ class DbMongo(DbBase):
         """
         try:
             result = []
-            collection = self.db[table]
-            db_filter = self._format_filter(q_filter)
-            rows = collection.find(db_filter)
+            with self.lock:
+                collection = self.db[table]
+                db_filter = self._format_filter(q_filter)
+                rows = collection.find(db_filter)
             for row in rows:
                 result.append(row)
             return result
@@ -225,10 +234,11 @@ class DbMongo(DbBase):
         """
         try:
             db_filter = self._format_filter(q_filter)
-            collection = self.db[table]
-            if not (fail_on_empty and fail_on_more):
-                return collection.find_one(db_filter)
-            rows = collection.find(db_filter)
+            with self.lock:
+                collection = self.db[table]
+                if not (fail_on_empty and fail_on_more):
+                    return collection.find_one(db_filter)
+                rows = collection.find(db_filter)
             if rows.count() == 0:
                 if fail_on_empty:
                     raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),
@@ -250,8 +260,9 @@ class DbMongo(DbBase):
         :return: Dict with the number of entries deleted
         """
         try:
-            collection = self.db[table]
-            rows = collection.delete_many(self._format_filter(q_filter))
+            with self.lock:
+                collection = self.db[table]
+                rows = collection.delete_many(self._format_filter(q_filter))
             return {"deleted": rows.deleted_count}
         except DbException:
             raise
@@ -268,8 +279,9 @@ class DbMongo(DbBase):
         :return: Dict with the number of entries deleted
         """
         try:
-            collection = self.db[table]
-            rows = collection.delete_one(self._format_filter(q_filter))
+            with self.lock:
+                collection = self.db[table]
+                rows = collection.delete_one(self._format_filter(q_filter))
             if rows.deleted_count == 0:
                 if fail_on_empty:
                     raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),
@@ -287,8 +299,9 @@ class DbMongo(DbBase):
         :return: database id of the inserted element. Raises a DbException on error
         """
         try:
-            collection = self.db[table]
-            data = collection.insert_one(indata)
+            with self.lock:
+                collection = self.db[table]
+                data = collection.insert_one(indata)
             return data.inserted_id
         except Exception as e:  # TODO refine
             raise DbException(e)
@@ -304,8 +317,9 @@ class DbMongo(DbBase):
         :return: Dict with the number of entries modified. None if no matching is found.
         """
         try:
-            collection = self.db[table]
-            rows = collection.update_one(self._format_filter(q_filter), {"$set": update_dict})
+            with self.lock:
+                collection = self.db[table]
+                rows = collection.update_one(self._format_filter(q_filter), {"$set": update_dict})
             if rows.matched_count == 0:
                 if fail_on_empty:
                     raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),
@@ -324,8 +338,9 @@ class DbMongo(DbBase):
         :return: Dict with the number of entries modified
         """
         try:
-            collection = self.db[table]
-            rows = collection.update_many(self._format_filter(q_filter), {"$set": update_dict})
+            with self.lock:
+                collection = self.db[table]
+                rows = collection.update_many(self._format_filter(q_filter), {"$set": update_dict})
             return {"modified": rows.modified_count}
         except Exception as e:  # TODO refine
             raise DbException(e)
@@ -342,8 +357,9 @@ class DbMongo(DbBase):
         """
         try:
             db_filter = {"_id": _id}
-            collection = self.db[table]
-            rows = collection.replace_one(db_filter, indata)
+            with self.lock:
+                collection = self.db[table]
+                rows = collection.replace_one(db_filter, indata)
             if rows.matched_count == 0:
                 if fail_on_empty:
                     raise DbException("Not found any {} with _id='{}'".format(table[:-1], _id), HTTPStatus.NOT_FOUND)