Remove the check for activate_this from wsgi.py since modern venv doesn't provide that script. Change the logging to always log when starting a wsgi instance.

- Legacy-Id: 18908
This commit is contained in:
Robert Sparks 2021-03-08 17:40:45 +00:00
parent d13d878103
commit e563b6e30d

View file

@ -51,17 +51,13 @@ path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER)
# Virtualenv support
virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py")
if os.path.exists(virtualenv_activation):
syslog.syslog("Starting datatracker wsgi with virtualenv %s" % os.path.dirname(os.path.dirname(virtualenv_activation)))
exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
if not path in sys.path:
sys.path.insert(0, path)
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
syslog.syslog("Starting datatracker wsgi instance")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()