From 6877a071ec261d70e241ac34919236829b02cfef Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Sun, 2 Apr 2023 12:11:49 +0800
Subject: [PATCH] Cleanup environment variable in tabby.server

---
 tabby/server/__init__.py | 4 ++++
 tabby/server/events.py   | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tabby/server/__init__.py b/tabby/server/__init__.py
index e203c50..63a1f7f 100644
--- a/tabby/server/__init__.py
+++ b/tabby/server/__init__.py
@@ -35,6 +35,10 @@ if MODEL_BACKEND == "triton":
 else:
     model_backend = PythonModelService(MODEL_NAME)
 
+LOGS_DIR = os.environ.get("LOGS_DIR", None)
+if LOGS_DIR is not None:
+    events.setup_logging(os.path.join(LOGS_DIR, "tabby-server"))
+
 
 @app.post("/v1/completions")
 async def completions(request: CompletionRequest) -> CompletionResponse:
diff --git a/tabby/server/events.py b/tabby/server/events.py
index 9e7cfaa..d2d930d 100644
--- a/tabby/server/events.py
+++ b/tabby/server/events.py
@@ -6,8 +6,6 @@ from pydantic import BaseModel
 
 from . import models
 
-logger.configure(handlers=[])
-
 
 def setup_logging(logdir):
     try:
@@ -15,6 +13,8 @@ def setup_logging(logdir):
     except FileNotFoundError:
         pass
 
+    # Remove default handler
+    logger.remove()
     logger.add(
         os.path.join(logdir, "events.{time}.log"),
         rotation="1 hours",
@@ -27,11 +27,6 @@ def setup_logging(logdir):
     )
 
 
-LOGS_DIR = os.environ.get("LOGS_DIR", None)
-if LOGS_DIR is not None:
-    setup_logging(os.path.join(LOGS_DIR, "tabby-server"))
-
-
 def log_completions(
     request: models.CompletionRequest, response: models.CompletionResponse
 ) -> None: