From ea8775f692ac7f7dc5b1622e20059d6e65d390c8 Mon Sep 17 00:00:00 2001
From: Fan Zhang <fan.zhang@ligo.org>
Date: Mon, 25 Aug 2014 23:59:41 +0000
Subject: [PATCH] Merging in Fan's changes.
---
fzhang.wsgi | 34 ++++++++++++++++++++++++++++++++++
manage.py | 1 -
settingsdir/__init__.py | 3 +++
settingsdir/default.py | 2 +-
4 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 fzhang.wsgi
diff --git a/fzhang.wsgi b/fzhang.wsgi
new file mode 100644
index 000000000..b0c06924a
--- /dev/null
+++ b/fzhang.wsgi
@@ -0,0 +1,34 @@
+import os
+import sys
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+# Sandbox libs here, if required.
+#
+
+#sys.path.append('/home/lars/wsgi-sandbox/lib/python2.6')
+#sys.path.append('/home/lars/wsgi-sandbox/lib/python2.6/site-packages')
+#sys.path.append('/home/gracedb/graceproj')
+
+#sys.path.append('/home/branson/sandbox/lib/python2.6/site-packages')
+#sys.path.append('/home/bmoe/sandbox/lib/python2.6')
+#sys.path.append('/home/bmoe/sandbox/lib/python2.6/site-packages')
+#sys.path.append('/home/branson/gracedbdev')
+
+sys.path.insert(1,'/home/fzhang/gracedb/gracedb')
+sys.path.insert(1,'/home/fzhang/djangoenv/lib/python2.7/site-packages')
+
+# Scott's Shib app uses loggers.
+import logging
+logging.basicConfig()
+
+os.environ['MPLCONFIGDIR']='/home/fzhang/gracedb/logs/'
+
+#logging.basicConfig(level=logging.DEBUG,
+# format='%(asctime)s %(levelname)s %(message)s',
+# filename='/tmp/myapp.log',
+# filemode='w')
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+
diff --git a/manage.py b/manage.py
index 91df9cd1c..52e24d629 100755
--- a/manage.py
+++ b/manage.py
@@ -2,7 +2,6 @@
from django.core.management import execute_manager
import os
-
try:
import settings # Assumed to be in the same directory.
except ImportError:
diff --git a/settingsdir/__init__.py b/settingsdir/__init__.py
index f6419d7fa..2c418284b 100644
--- a/settingsdir/__init__.py
+++ b/settingsdir/__init__.py
@@ -29,6 +29,9 @@ configs = {
'/home/branson/gracedbdev': 'branson',
'/home/branson/gracedbdev/gracedb': 'branson',
+ '/home/fzhang/gracedb/gracedb': 'fan',
+ '/home/fzhang/gracedb/gracedb/gracedb': 'fan',
+
"/home/gracedb/gracestage" : "stage",
}
diff --git a/settingsdir/default.py b/settingsdir/default.py
index 18ab31b2f..3ecc5db10 100644
--- a/settingsdir/default.py
+++ b/settingsdir/default.py
@@ -243,7 +243,7 @@ STATICFILES_DIRS = ()
# XXX The following Log settings are for a performance metric.
import logging
-LOG_ROOT = '/home/gracedb/logs'
+LOG_ROOT = '/home/fzhang/gracedb/logs'
# Filter objects to separate out each level of alert.
class infoOnlyFilter(logging.Filter):
--
GitLab