alessandro trinca tornidor
commited on
Commit
·
c45d62b
1
Parent(s):
ec8eaa3
feat: update get_client() from pymongo_utils.py
Browse files
my_ghost_writer/pymongo_utils.py
CHANGED
|
@@ -1,10 +1,19 @@
|
|
| 1 |
from pymongo import MongoClient
|
|
|
|
| 2 |
|
| 3 |
from my_ghost_writer.constants import DEFAULT_DBNAME_THESAURUS, ME_CONFIG_MONGODB_URL, DEFAULT_COLLECTION_THESAURUS, ME_CONFIG_MONGODB_TIMEOUT, app_logger
|
| 4 |
|
| 5 |
|
| 6 |
def get_client() -> MongoClient:
|
| 7 |
-
client = MongoClient(ME_CONFIG_MONGODB_URL, timeoutMS=ME_CONFIG_MONGODB_TIMEOUT)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 8 |
return client
|
| 9 |
|
| 10 |
|
|
@@ -20,8 +29,6 @@ def get_thesaurus_collection(db_name: str = DEFAULT_DBNAME_THESAURUS, collection
|
|
| 20 |
|
| 21 |
def mongodb_health_check(db_name: str = DEFAULT_DBNAME_THESAURUS, collection_name: str = DEFAULT_COLLECTION_THESAURUS) -> bool:
|
| 22 |
client = get_client()
|
| 23 |
-
# Check server is available
|
| 24 |
-
client.admin.command('ping', check=True)
|
| 25 |
server_info = client.server_info()
|
| 26 |
server_version = server_info["version"]
|
| 27 |
app_logger.info(f"mongodb server_version:{server_version}!")
|
|
|
|
| 1 |
from pymongo import MongoClient
|
| 2 |
+
from pymongo.server_api import ServerApi
|
| 3 |
|
| 4 |
from my_ghost_writer.constants import DEFAULT_DBNAME_THESAURUS, ME_CONFIG_MONGODB_URL, DEFAULT_COLLECTION_THESAURUS, ME_CONFIG_MONGODB_TIMEOUT, app_logger
|
| 5 |
|
| 6 |
|
| 7 |
def get_client() -> MongoClient:
|
| 8 |
+
client = MongoClient(ME_CONFIG_MONGODB_URL, timeoutMS=ME_CONFIG_MONGODB_TIMEOUT, server_api=ServerApi('1'))
|
| 9 |
+
|
| 10 |
+
try:
|
| 11 |
+
client.admin.command('ping', check=True)
|
| 12 |
+
app_logger.info("Pinged your deployment. You successfully connected to MongoDB!")
|
| 13 |
+
except Exception as e:
|
| 14 |
+
app_logger.error(f"failed to connect to mongodb: {e}!")
|
| 15 |
+
raise e
|
| 16 |
+
|
| 17 |
return client
|
| 18 |
|
| 19 |
|
|
|
|
| 29 |
|
| 30 |
def mongodb_health_check(db_name: str = DEFAULT_DBNAME_THESAURUS, collection_name: str = DEFAULT_COLLECTION_THESAURUS) -> bool:
|
| 31 |
client = get_client()
|
|
|
|
|
|
|
| 32 |
server_info = client.server_info()
|
| 33 |
server_version = server_info["version"]
|
| 34 |
app_logger.info(f"mongodb server_version:{server_version}!")
|