ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-07 13:33:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve database module naming ambiguity

Browse Source
This commit is contained in:
allegroai 2021-01-05 16:45:22 +02:00
parent e24389fda9
commit 29ef134b79
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apiserver/app_sequence.py
View File

@ -4,7 +4,7 @@ from hashlib import md5
from flask import Flask from flask import Flask
from semantic_version import Version from semantic_version import Version
from apiserver.database import database from apiserver.database import db
from apiserver.bll.statistics.stats_reporter import StatisticsReporter from apiserver.bll.statistics.stats_reporter import StatisticsReporter
from apiserver.config import info from apiserver.config import info
from apiserver.config_repo import config from apiserver.config_repo import config
@ -44,10 +44,10 @@ class AppSequence:
) )
def _init_dbs(self): def _init_dbs(self):
database.initialize() db.initialize()
# build a key that uniquely identifies specific mongo instance # build a key that uniquely identifies specific mongo instance
hosts_string = ";".join(sorted(database.get_hosts())) hosts_string = ";".join(sorted(db.get_hosts()))
key = "db_init_" + md5(hosts_string.encode()).hexdigest() key = "db_init_" + md5(hosts_string.encode()).hexdigest()
with distributed_lock(key, timeout=config.get("apiserver.db_init_timout", 120)): with distributed_lock(key, timeout=config.get("apiserver.db_init_timout", 120)):
upgrade_monitoring = config.get( upgrade_monitoring = config.get(

2
apiserver/database/__init__.py
View File

@ -95,4 +95,4 @@ class DatabaseFactory:
get_connection(entry.alias) get_connection(entry.alias)
database = DatabaseFactory() db = DatabaseFactory()

4
apiserver/tools.py
View File

@ -6,8 +6,8 @@ from humanfriendly import parse_timespan
def setup(): def setup():
from apiserver.database import database from apiserver.database import db
database.initialize() db.initialize()
def gen_token(args): def gen_token(args):