Fix for permissions, fix exception handling (WSGI)

Makefile

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

mamweb/wsgi.py

@@ -7,21 +7,22 @@ For more information on this file, see
 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")
 
-sys.path.append(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__), '..')))
+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:
+    from django.core.wsgi import get_wsgi_application
     application = get_wsgi_application()
+
 except Exception:
     print 'handling WSGI exception'
     # Error loading applications
     if 'mod_wsgi' in sys.modules:
         traceback.print_exc()
         os.kill(os.getpid(), signal.SIGINT)
-        time.sleep(10)
+        time.sleep(2)