Merge pull request #414 from helsonxiao/master

Fix rundramatiq and add important docs

deploy/supervisord.conf

@@ -39,7 +39,7 @@ stopwaitsecs = 5
 killasgroup=true
 
 [program:dramatiq]
-command=python3 manage.py rundramatiq --no-reload --processes %(ENV_MAX_WORKER_NUM)s --threads 4
+command=python3 manage.py rundramatiq --processes %(ENV_MAX_WORKER_NUM)s --threads 4
 directory=/app/
 user=nobody
 stdout_logfile=/data/log/dramatiq.log

docs/data.json

@@ -5,6 +5,7 @@
       "level": "Important",
       "title": "2021-11-20",
       "details": [
+        "<span style=\"color:  red;\">升级 django-dramatiq 至 0.10.0，解决数据库连接无法释放的问题</span>",
         "django2.x即将停止支持，更新django到3.x LTS，相应地更新了全部相关依赖",
         "合并底包版本到python3.8-alpine3.14，为移除python2做准备",
         "按上游包的生产环境规范，修改依赖psycopg2_binary为psycopg2",

oj/dev_settings.py

@@ -1,22 +1,23 @@
 # coding=utf-8
 import os
+from utils.shortcuts import get_env
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': '127.0.0.1',
-        'PORT': 5435,
-        'NAME': "onlinejudge",
-        'USER': "onlinejudge",
-        'PASSWORD': 'onlinejudge'
+        'HOST': get_env('POSTGRES_HOST', '127.0.0.1'),
+        'PORT': get_env('POSTGRES_PORT', '5435'),
+        'NAME': get_env('POSTGRES_DB', 'onlinejudge'),
+        'USER': get_env('POSTGRES_USER', 'onlinejudge'),
+        'PASSWORD': get_env('POSTGRES_PASSWORD', 'onlinejudge')
     }
 }
 
 REDIS_CONF = {
-    "host": "127.0.0.1",
-    "port": "6380"
+    'host': get_env('REDIS_HOST', '127.0.0.1'),
+    'port': get_env('REDIS_PORT', '6380')
 }