Modified config and made gunicorn config executable

Author: sumitsk20

config/gunicorn/analytics-dev.gunicorn.sh

@@ -1,9 +1,9 @@
 #!/bin/bash   
 
 # Project directory                               
-PROJECTDIR=/webapps/demo-analytics-dev
+PROJECTDIR=/webapps/demo-analytics-dev/src
 # App instance module
-ASGI_MODULE=src/server.asgi
+ASGI_MODULE=server.asgi
 # we will communicte using this unix socket                      
 SOCKFILE=/webapps/demo-analytics-dev/run/unicorn_dev.sock
 
@@ -15,7 +15,7 @@ GROUP=webapps
 # Number of Workers
 NUM_WORKERS=1
 
-WORKER_CLASS=venv/lib/uvicorn.workers.UvicornWorker
+WORKER_CLASS=uvicorn.workers.UvicornWorker
 
 TIMEOUT=300
 GRACEFUL_TIMEOUT=120
@@ -27,15 +27,15 @@ echo "Starting $NAME as `whoami`"
 
 # Activate the virtual environment
 cd $PROJECTDIR
-source venv/bin/activate
+source ../venv/bin/activate
 
 # Create the run directory if it doesn't exist
 RUNDIR=$(dirname $SOCKFILE)
 test -d $RUNDIR || mkdir -p $RUNDIR
 
 # Start your Unicorn
 # Programs meant to be run under supervisor should not daemonize themselves (do not use --daemon)
-exec venv/bin/gunicorn ${ASGI_MODULE}:app \
+exec ../venv/bin/gunicorn ${ASGI_MODULE}:app \
     --worker-class $WORKER_CLASS \
     --workers $NUM_WORKERS \
     --timeout $TIMEOUT \

config/gunicorn/analytics-pre-dev.gunicorn.sh

@@ -1,9 +1,9 @@
 #!/bin/bash   
 
 # Project directory                               
-PROJECTDIR=/webapps/demo-analytics-pre-dev 
+PROJECTDIR=/webapps/demo-analytics-pre-dev/src
 # App instance module
-ASGI_MODULE=src/server.asgi
+ASGI_MODULE=server.asgi
 # we will communicte using this unix socket                      
 SOCKFILE=/webapps/demo-analytics-pre-dev/run/unicorn_pre_dev.sock
 
@@ -15,7 +15,7 @@ GROUP=webapps
 # Number of Workers
 NUM_WORKERS=1
 
-WORKER_CLASS=venv/lib/uvicorn.workers.UvicornWorker
+WORKER_CLASS=uvicorn.workers.UvicornWorker
 
 TIMEOUT=300
 GRACEFUL_TIMEOUT=120
@@ -27,15 +27,15 @@ echo "Starting $NAME as `whoami`"
 
 # Activate the virtual environment
 cd $PROJECTDIR
-source venv/bin/activate
+source ../venv/bin/activate
 
 # Create the run directory if it doesn't exist
 RUNDIR=$(dirname $SOCKFILE)
 test -d $RUNDIR || mkdir -p $RUNDIR
 
 # Start your Unicorn
 # Programs meant to be run under supervisor should not daemonize themselves (do not use --daemon)
-exec venv/bin/gunicorn ${ASGI_MODULE}:app \
+exec ../venv/bin/gunicorn ${ASGI_MODULE}:app \
     --worker-class $WORKER_CLASS \
     --workers $NUM_WORKERS \
     --timeout $TIMEOUT \

config/gunicorn/analytics.gunicorn.sh

@@ -1,9 +1,9 @@
 #!/bin/bash   
 
 # Project directory                               
-PROJECTDIR=/webapps/demo-analytics
+PROJECTDIR=/webapps/demo-analytics/src
 # App instance module
-ASGI_MODULE=src/server.asgi
+ASGI_MODULE=server.asgi
 # we will communicte using this unix socket                      
 SOCKFILE=/webapps/demo-analytics/run/unicorn_live.sock
 
@@ -15,7 +15,7 @@ GROUP=webapps
 # Number of Workers
 NUM_WORKERS=3
 
-WORKER_CLASS=venv/lib/uvicorn.workers.UvicornWorker
+WORKER_CLASS=uvicorn.workers.UvicornWorker
 
 TIMEOUT=300
 GRACEFUL_TIMEOUT=120
@@ -27,15 +27,15 @@ echo "Starting $NAME as `whoami`"
 
 # Activate the virtual environment
 cd $PROJECTDIR
-source venv/bin/activate
+source ../venv/bin/activate
 
 # Create the run directory if it doesn't exist
 RUNDIR=$(dirname $SOCKFILE)
 test -d $RUNDIR || mkdir -p $RUNDIR
 
 # Start your Unicorn
 # Programs meant to be run under supervisor should not daemonize themselves (do not use --daemon)
-exec venv/bin/gunicorn ${ASGI_MODULE}:app \
+exec ../venv/bin/gunicorn ${ASGI_MODULE}:app \
     --worker-class $WORKER_CLASS \
     --workers $NUM_WORKERS \
     --timeout $TIMEOUT \

config/supervisor/analytics-develop.supervisor.conf

@@ -1,5 +1,5 @@
 [program:analytics_dev]
-command = /webapps/demo-analytics-dev/conf/gunicorn/analytics-dev.gunicorn.sh
+command = /webapps/demo-analytics-dev/config/gunicorn/analytics-dev.gunicorn.sh
 user = demo-analytics-dev
 # stdout_logfile = /webapps/freadom/dev/log/dev-supervisor.log
 # redirect_stderr = true

config/supervisor/analytics-pre-dev.supervisor.conf

@@ -1,5 +1,5 @@
 [program:analytics_pre_dev]
-command = /webapps/demo-analytics-pre-dev/conf/gunicorn/analytics-pre-dev.gunicorn.sh
+command = /webapps/demo-analytics-pre-dev/config/gunicorn/analytics-pre-dev.gunicorn.sh
 user = demo-analytics-pre-dev
 # stdout_logfile = /webapps/freadom/dev/log/dev-supervisor.log
 # redirect_stderr = true

config/supervisor/analytics.supervisor.conf

@@ -1,5 +1,5 @@
 [program:analytics_live]
-command = /webapps/demo-analytics/conf/gunicorn/analytics.gunicorn.sh
+command = /webapps/demo-analytics/config/gunicorn/analytics.gunicorn.sh
 user = demo-analytics
 # stdout_logfile = /webapps/freadom/dev/log/dev-supervisor.log
 # redirect_stderr = true

src/core/settings.py

@@ -1,12 +1,15 @@
 import logging
 import sys
+import os
 from typing import List
 
 from starlette.config import Config
 from starlette.datastructures import CommaSeparatedStrings, Secret
 
+SRC_DIR = os.path.dirname(os.path.dirname(__file__))
+
+config = Config(os.path.join(os.path.dirname(SRC_DIR), ".env"))
 
-config = Config(".env")
 DEBUG: bool = config("DEBUG", cast=bool, default=False)
 SECRET_KEY: Secret = config(
     "SECRET_KEY", default="UBzPj7Qj29K4z4aeCqZ40xi8dVdTbbch", cast=Secret
@@ -15,8 +18,8 @@
 VERSION: str = config("VERSION", default="1.0.0")
 MONGO_URI: str = config("MONGO_URI", default="mongodb://127.0.0.1:27017")
 MONGO_DB_NAME: str = config("MONGO_DB_NAME", default="demo_db")
-MONGO_MAX_POOL_SIZE: int = config("MONGO_MAX_POOL_SIZE", default=2)
-MONGO_MIN_POOL_SIZE: int = config("MONGO_MIN_POOL_SIZE", default=15)
+MONGO_MAX_POOL_SIZE: int = config("MONGO_MAX_POOL_SIZE", default=15)
+MONGO_MIN_POOL_SIZE: int = config("MONGO_MIN_POOL_SIZE", default=2)
 ALLOWED_HOSTS: List[str] = config(
     "ALLOWED_HOSTS", cast=CommaSeparatedStrings, default=""
 )