Merge pull request #224

feat: settings use db pool
lihuacai168 · Aug 31, 2024 · 1c65e46 · 1c65e46
2 parents 706864e + bfc1d63
commit 1c65e46
Show file tree

Hide file tree

Showing 6 changed files with 179 additions and 14 deletions.
diff --git a/FasterRunner/settings/dev.py b/FasterRunner/settings/dev.py
@@ -23,19 +23,31 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.mysql",
+        "ENGINE": "dj_db_conn_pool.backends.mysql",
         "NAME": "fast",  # 新建数据库
         # 'NAME': 'fast_mb4',  # 新建数据库名
         "HOST": "127.0.0.1",
         "USER": "root",  # 数据库登录名
         "PASSWORD": "root",  # 数据库登录密码
-        "OPTIONS": {"charset": "utf8mb4"},
-        # 单元测试数据库
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+        },
+        'POOL_OPTIONS': {
+            'POOL_SIZE': 20,
+            'MAX_OVERFLOW': 20,
+            'RECYCLE': 24 * 60 * 60,
+            'PRE_PING': True,
+            'ECHO': False,
+            'TIMEOUT': 30,
+        },
         "TEST": {
             "NAME": "test_fast_last",  # 测试过程中会生成名字为test的数据库,测试结束后Django会自动删除该数据库
         },
     }
 }
+
+
+
 # IM_REPORT_SETTING.update({'platform_name': '银河飞梭测试平台'})
 
 BROKER_URL = "amqp://username:password@localhost:5672//"

diff --git a/FasterRunner/settings/docker.py b/FasterRunner/settings/docker.py
@@ -47,16 +47,20 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.mysql",
+        "ENGINE": "dj_db_conn_pool.backends.mysql",
         "HOST": DB_HOST,
         "PORT": DB_PORT,
         "NAME": DB_NAME,  # 新建数据库名
         "USER": DB_USER,  # 数据库登录名
         "PASSWORD": DB_PASSWORD,  # 数据库登录密码
         "OPTIONS": {"charset": "utf8mb4"},
-        "TEST": {
-            # 'MIRROR': 'default',  # 单元测试时,使用default的配置
-            # 'DEPENDENCIES': ['default']
+        'POOL_OPTIONS': {
+            'POOL_SIZE': 20,
+            'MAX_OVERFLOW': 20,
+            'RECYCLE': 24 * 60 * 60,
+            'PRE_PING': True,
+            'ECHO': False,
+            'TIMEOUT': 30,
         },
     }
 }

diff --git a/FasterRunner/settings/pro.py b/FasterRunner/settings/pro.py
@@ -46,15 +46,19 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.mysql",
+        "ENGINE": "dj_db_conn_pool.backends.mysql",
         "HOST": MYSQL_HOST,
         "NAME": DB_NAME,  # 新建数据库名
         "USER": DB_USER,  # 数据库登录名
         "PASSWORD": DB_PASSWORD,  # 数据库登录密码
         "OPTIONS": {"charset": "utf8mb4"},
-        "TEST": {
-            # 'MIRROR': 'default',  # 单元测试时,使用default的配置
-            # 'DEPENDENCIES': ['default']
+        'POOL_OPTIONS': {
+            'POOL_SIZE': 20,
+            'MAX_OVERFLOW': 20,
+            'RECYCLE': 24 * 60 * 60,
+            'PRE_PING': True,
+            'ECHO': False,
+            'TIMEOUT': 30,
         },
     }
 }

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -71,6 +71,7 @@ django-auth-ldap = "2.3.0"
 pymysql = "1.1.0"
 pytest = "^8.1.1"
 pytest-django = "^4.8.0"
+django-db-connection-pool = {extras = ["mysql"], version = "^1.2.5"}
 
 
 [tool.poetry.group.dev.dependencies]

diff --git a/requirements.txt b/requirements.txt
@@ -61,4 +61,5 @@ django-filter==2.4.0,<2.5.0
 #django-auth-ldap==2.3.0
 pymysql==1.1.0
 pytest==8.1.1
-pytest-django==4.8.0
+pytest-django==4.8.0
+django-db-connection-pool[mysql]==1.2.5