jack 1 mese fa
parent
commit
a4cb54cbd3
6 ha cambiato i file con 8 aggiunte e 8 eliminazioni
  1. 1 1
      .env.example
  2. 2 2
      Dockerfile
  3. 2 2
      docker-compose.yml
  4. 2 2
      docker/entrypoint.sh
  5. 0 0
      poetry.lock
  6. 1 1
      pyproject.toml

+ 1 - 1
.env.example

@@ -4,7 +4,7 @@ APP_DEBUG=True
 APP_ENV=local
 APP_ENV=local
 APP_SERVER_HOST=0.0.0.0
 APP_SERVER_HOST=0.0.0.0
 APP_SERVER_PORT=8086
 APP_SERVER_PORT=8086
-APP_SERVER_WORKERS=1
+APP_SERVER_WORKERS=20
 APP_API_PREFIX=/api
 APP_API_PREFIX=/api
 APP_AUTH_ENABLE=False
 APP_AUTH_ENABLE=False
 APP_AUTH_ADMIN_TOKEN=admin
 APP_AUTH_ADMIN_TOKEN=admin

+ 2 - 2
Dockerfile

@@ -16,8 +16,8 @@ COPY pyproject.toml /env/pyproject.toml
 
 
 #RUN poetry config repositories.pypi https://pypi.tuna.tsinghua.edu.cn/simple
 #RUN poetry config repositories.pypi https://pypi.tuna.tsinghua.edu.cn/simple
 #RUN cd /env && poetry lock --no-update && poetry install --only main
 #RUN cd /env && poetry lock --no-update && poetry install --only main
-RUN cd /env && poetry install --only main
-#RUN cd /env && poetry lock && poetry install --only main
+#RUN cd /env && poetry install --only main
+RUN cd /env && poetry lock && poetry install --only main
 #RUN pip install openai==1.27.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
 #RUN pip install openai==1.27.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 
 EXPOSE 8086
 EXPOSE 8086

+ 2 - 2
docker-compose.yml

@@ -18,7 +18,7 @@ services:
       APP_DEBUG: true
       APP_DEBUG: true
       APP_ENV: prod
       APP_ENV: prod
 
 
-      APP_SERVER_WORKERS: 50
+      APP_SERVER_WORKERS: 20
       APP_API_PREFIX: /api
       APP_API_PREFIX: /api
 
 
       APP_AUTH_ENABLE: false
       APP_AUTH_ENABLE: false
@@ -96,7 +96,7 @@ services:
 
 
       # celery
       # celery
       CELERY_BROKER_URL: redis://:123456@redis:6379/1
       CELERY_BROKER_URL: redis://:123456@redis:6379/1
-      CELERY_WORKERS: 50
+      CELERY_WORKERS: 100
 
 
       # database
       # database
       DB_HOST: db
       DB_HOST: db

+ 2 - 2
docker/entrypoint.sh

@@ -11,6 +11,6 @@ if [[ "${MODE}" == "worker" ]]; then
   echo "celery run"
   echo "celery run"
   celery -A worker.celery_app worker -c ${CELERY_WORKERS:-1} -l INFO
   celery -A worker.celery_app worker -c ${CELERY_WORKERS:-1} -l INFO
 else
 else
-  uvicorn main:app --host 0.0.0.0 --port 8086 --workers ${APP_SERVER_WORKERS:-1}
-  #gunicorn -w ${APP_SERVER_WORKERS:-1} -t ${APP_SERVER_WORKERS:-1} -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:8086 main:app
+  #uvicorn main:app --host 0.0.0.0 --port 8086 --workers ${APP_SERVER_WORKERS:-1}
+  gunicorn -w ${APP_SERVER_WORKERS:-1} -t ${APP_SERVER_WORKERS:-1} -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:8086 main:app
 fi
 fi

+ 0 - 0
poetry.lock.bak → poetry.lock


+ 1 - 1
pyproject.toml

@@ -258,7 +258,7 @@ yarl = "1.18.3"
 zipp = "3.21.0"
 zipp = "3.21.0"
 zope-event = "5.0"
 zope-event = "5.0"
 zope-interface = "6.2"
 zope-interface = "6.2"
-gunicorn = "23.0.0"
+#gunicorn = "23.0.0"
 
 
 [build-system]
 [build-system]
 requires = ["poetry-core"]
 requires = ["poetry-core"]