mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Fix for permissions, fix exception handling (WSGI)

Browse source
This commit is contained in:
Tomas Gavenciak 2015-09-17 18:27:44 +02:00
parent 0d80c837ab
commit c0607297c7
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -68,7 +68,7 @@ deploy_test:
./manage.py migrate ./manage.py migrate
./manage.py collectstatic --noinput ./manage.py collectstatic --noinput
(chown -Rf :mam . || true ) (chown -Rf :mam . || true )
(chmod -Rf g+w . || true ) (chmod -Rf g+rwX . || true )
touch mamweb/wsgi.py touch mamweb/wsgi.py
@echo Done. @echo Done.
@ -84,7 +84,7 @@ deploy_prod:
./manage.py migrate ./manage.py migrate
./manage.py collectstatic --noinput ./manage.py collectstatic --noinput
(chown -Rf :mam . || true ) (chown -Rf :mam . || true )
(chmod -Rf g+w . || true ) (chmod -Rf g+rwX . || true )
touch mamweb/wsgi.py touch mamweb/wsgi.py
@echo Done. @echo Done.

11
mamweb/wsgi.py
View file

@ -7,21 +7,22 @@ For more information on this file, see
https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
""" """
import sys, os, os.path, traceback, time import sys, os, os.path, traceback, time, signal
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mamweb.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mamweb.settings")
sys.path.append(os.path.join(os.path.dirname(__file__), '..')) sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'lib', 'python2.7', 'site-packages')) sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib', 'python2.7', 'site-packages')))
from django.core.wsgi import get_wsgi_application
try: try:
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application() application = get_wsgi_application()
except Exception: except Exception:
print 'handling WSGI exception' print 'handling WSGI exception'
# Error loading applications # Error loading applications
if 'mod_wsgi' in sys.modules: if 'mod_wsgi' in sys.modules:
traceback.print_exc() traceback.print_exc()
os.kill(os.getpid(), signal.SIGINT) os.kill(os.getpid(), signal.SIGINT)
time.sleep(10) time.sleep(2)