Skip to content

Commit 8670c47

Browse files
authored
Refactor code to get connection uri as one single env variable
1 parent 5eb5b4e commit 8670c47

File tree

4 files changed

+7
-17
lines changed

4 files changed

+7
-17
lines changed

backend/backend/apis/bwwc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def backup(req: HttpRequest) -> HttpResponse:
308308
def mongo_health(req: HttpRequest) -> HttpResponse:
309309
if req.method == "GET":
310310
if not engine.is_mongodb_running():
311-
return HttpResponseBadRequest(f"MongoDB is downnn at: mongodb://{engine.mongo_user}:{engine.mongo_password}@{engine.mongo_host}:{engine.mongo_port}/{engine.mongo_db}?{engine.mongo_params}")
311+
return HttpResponseBadRequest(f"MongoDB is downnn at: {engine.mongo_uri}")
312312
else:
313313
return HttpResponse("MongoDB is up")
314314
else:

backend/env/.env.dev

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ POSTGRES_PORT = 5432
1010
POSTGRES_USERNAME = postgres
1111
POSTGRES_PASSWORD = postgres
1212
POSTGRES_DATABASE = bwwc
13-
MONGO_HOST = mongo
14-
MONGO_PORT = 27017
15-
MONGO_USER = bwwc
16-
MONGO_PASSWORD = mongo
17-
MONGO_DB = bwwc
18-
MONGO_PARAMS = ""
13+
MONGO_URI = mongodb://mongo:27017
1914
DJANGO_ALLOWED_HOSTS = ""
2015
ALLOW_ALL_HOSTS = false

backend/env/.env.example

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ SECRET_KEY = mysecret
22
PRIME = 2
33
BASE_URL = http://localhost:8000
44
THRESHOLD = 3
5-
MONGO_HOST = mongodb://localhost:27017/
65
REDIS_HOST = localhost
76
REDIS_PW = secure_password
87
AUTH_PK_API = https:/auth-service.sail.codes/public-key
@@ -11,11 +10,6 @@ POSTGRES_PORT = 5432
1110
POSTGRES_USERNAME = postgres
1211
POSTGRES_PASSWORD = postgres
1312
POSTGRES_DATABASE = bwwc
14-
MONGO_HOST = localhost
15-
MONGO_PORT = 27017
16-
MONGO_USER = bwwc
17-
MONGO_PASSWORD = mongo
18-
MONGO_DB = bwwc
19-
MONGO_PARAMS = ""
13+
MONGO_URI = mongodb://localhost:27017/
2014
DJANGO_ALLOWED_HOSTS = ""
2115
ALLOW_ALL_HOSTS = false

backend/secretshare/mpce.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ class MPCEngine(object):
3434
def __init__(self, protocol: str = "shamirs", prime: int = 180252380737439):
3535
self.logger = logging.getLogger("django")
3636

37-
self.mongo_host = os.environ.get("MONGO_HOST")
37+
'''self.mongo_host = os.environ.get("MONGO_HOST")
3838
self.mongo_port = os.environ.get("MONGO_PORT")
3939
self.mongo_user = urllib.parse.quote_plus(os.environ.get("MONGO_USER", "bwwc"))
4040
self.mongo_password = urllib.parse.quote_plus(os.environ.get("MONGO_PASSWORD"))
4141
self.mongo_db = os.environ.get("MONGO_DB", "bwwc")
4242
self.mongo_params = os.environ.get("MONGO_PARAMS", "")
43-
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"
44-
self.logger.info(f"Connection URI is: {mongo_uri}")
43+
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"'''
44+
self.mongo_uri = os.environ.get("MONGO_URI", "mongodb://localhost:27017/")
45+
self.logger.info(f"Connection URI is: {self.mongo_uri}")
4546

4647
self.mongo_client = MongoClient(mongo_uri)
4748

0 commit comments

Comments
 (0)