mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-25 18:54:30 +00:00
fix(proxy_server.py): don't reconnect prisma if already connected
This commit is contained in:
parent
e97eff4243
commit
cd350ab8d8
3 changed files with 8 additions and 4 deletions
|
@ -1156,7 +1156,7 @@ async def startup_event():
|
|||
|
||||
### CONNECT TO DB ###
|
||||
# check if DATABASE_URL in environment - load from there
|
||||
if os.getenv("DATABASE_URL", None) is not None and prisma_client is None:
|
||||
if prisma_client is None:
|
||||
prisma_setup(database_url=os.getenv("DATABASE_URL"))
|
||||
|
||||
### LOAD CONFIG ###
|
||||
|
@ -1184,7 +1184,7 @@ async def startup_event():
|
|||
) # start the background health check coroutine.
|
||||
|
||||
verbose_proxy_logger.debug(f"prisma client - {prisma_client}")
|
||||
if prisma_client:
|
||||
if prisma_client is not None:
|
||||
await prisma_client.connect()
|
||||
|
||||
if prisma_client is not None and master_key is not None:
|
||||
|
|
|
@ -555,6 +555,7 @@ class PrismaClient:
|
|||
)
|
||||
async def connect(self):
|
||||
try:
|
||||
if self.db.is_connected() == False:
|
||||
await self.db.connect()
|
||||
except Exception as e:
|
||||
asyncio.create_task(
|
||||
|
|
|
@ -19,7 +19,8 @@ from litellm.proxy.proxy_server import (
|
|||
save_worker_config,
|
||||
initialize,
|
||||
startup_event,
|
||||
llm_model_list
|
||||
llm_model_list,
|
||||
shutdown_event
|
||||
)
|
||||
|
||||
def test_proxy_gunicorn_startup_direct_config():
|
||||
|
@ -36,6 +37,7 @@ def test_proxy_gunicorn_startup_direct_config():
|
|||
config_fp = f"{filepath}/test_configs/test_config_no_auth.yaml"
|
||||
os.environ["WORKER_CONFIG"] = config_fp
|
||||
asyncio.run(startup_event())
|
||||
asyncio.run(shutdown_event())
|
||||
except Exception as e:
|
||||
if "Already connected to the query engine" in str(e):
|
||||
pass
|
||||
|
@ -51,6 +53,7 @@ def test_proxy_gunicorn_startup_config_dict():
|
|||
worker_config = {"config": config_fp}
|
||||
os.environ["WORKER_CONFIG"] = json.dumps(worker_config)
|
||||
asyncio.run(startup_event())
|
||||
asyncio.run(shutdown_event())
|
||||
except Exception as e:
|
||||
if "Already connected to the query engine" in str(e):
|
||||
pass
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue