summaryrefslogtreecommitdiff
path: root/coip
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-12-04 00:15:20 +0100
committerLeif Johansson <leifj@sunet.se>2010-12-04 00:15:20 +0100
commitd22de6a89f558341dc8720306daaa520d9001bf8 (patch)
tree76dc74eb50a01ec348caae9f4dc6928c506e832d /coip
parent76e44e1e96efdde02c2d40e2eea1424b01bd78e4 (diff)
logging instead of stderr
Diffstat (limited to 'coip')
-rw-r--r--coip/apps/invitation/models.py3
-rw-r--r--coip/apps/membership/models.py3
-rw-r--r--coip/apps/name/models.py2
-rw-r--r--coip/apps/name/views.py5
-rw-r--r--coip/apps/userprofile/views.py2
-rw-r--r--coip/extensions/templatetags/userdisplay.py5
-rw-r--r--coip/settings.py2
-rw-r--r--coip/site_logging.py10
8 files changed, 24 insertions, 8 deletions
diff --git a/coip/apps/invitation/models.py b/coip/apps/invitation/models.py
index 818c587..2c1b33b 100644
--- a/coip/apps/invitation/models.py
+++ b/coip/apps/invitation/models.py
@@ -7,9 +7,10 @@ from django.db import models
from django.contrib.auth.models import User
from coip.apps.name.models import Name
import datetime
-from pprint import pprint
+from pprint import pformat
from django.core.mail import send_mail
from coip.apps.userprofile.models import last_used_profile
+import logging
class Invitation(models.Model):
'''
diff --git a/coip/apps/membership/models.py b/coip/apps/membership/models.py
index 9ff6a89..c71f6ca 100644
--- a/coip/apps/membership/models.py
+++ b/coip/apps/membership/models.py
@@ -7,7 +7,8 @@ from django.db import models
from django.contrib.auth.models import User
from coip.apps.name.models import Name
import datetime
-from pprint import pprint
+from pprint import pformat
+import logging
class Membership(models.Model):
'''
diff --git a/coip/apps/name/models.py b/coip/apps/name/models.py
index 6b6e977..9eda102 100644
--- a/coip/apps/name/models.py
+++ b/coip/apps/name/models.py
@@ -5,7 +5,7 @@ Created on Jun 24, 2010
'''
from django.db import models
import re
-from pprint import pprint
+from pprint import pformat
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from django.db.models.signals import pre_save
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py
index 47f06d0..86ee66c 100644
--- a/coip/apps/name/views.py
+++ b/coip/apps/name/views.py
@@ -9,7 +9,8 @@ from django.http import HttpResponseNotFound, HttpResponseForbidden,\
HttpResponseRedirect, Http404
from django.contrib.auth.decorators import login_required
from coip.multiresponse import respond_to, json_response, render403
-from pprint import pprint
+from pprint import pformat
+import logging
from coip.apps.name.forms import NameEditForm, NewNameForm, NameDeleteForm,\
PermissionForm
from twisted.python.reflect import ObjectNotFound
@@ -202,7 +203,7 @@ def _tree(request,id=None,includeroot=False):
if request.GET.has_key('depth'):
depth = request.GET['depth']
t = traverse(name,_tree_node,request.user,depth,includeroot)
- pprint(t)
+ logging.debug(t)
return json_response(t)
@login_required
diff --git a/coip/apps/userprofile/views.py b/coip/apps/userprofile/views.py
index 57d8898..59633de 100644
--- a/coip/apps/userprofile/views.py
+++ b/coip/apps/userprofile/views.py
@@ -10,7 +10,7 @@ from coip.multiresponse import respond_to
from coip.apps.membership.models import Membership, add_member
from coip.apps.userprofile.utils import user_profile
from django.core.exceptions import ObjectDoesNotExist
-from pprint import pprint
+from pprint import pformat
from coip.apps.auth.utils import nonce
from coip.apps.name.models import Name, NameLink, lookup
diff --git a/coip/extensions/templatetags/userdisplay.py b/coip/extensions/templatetags/userdisplay.py
index acf3e41..9def122 100644
--- a/coip/extensions/templatetags/userdisplay.py
+++ b/coip/extensions/templatetags/userdisplay.py
@@ -1,7 +1,8 @@
from django import template
from django.template import defaultfilters
from coip.apps.userprofile.models import last_used_profile
-from pprint import pprint
+from pprint import pformat
+import logging
register = template.Library()
@@ -13,7 +14,7 @@ def userdisplay(user):
p = last_used_profile(user)
return p.display_name
except Exception,e:
- pprint(e)
+ logging.warning(e)
return user.username
userdisplay.is_safe = True
diff --git a/coip/settings.py b/coip/settings.py
index 02f3ce5..78d7b72 100644
--- a/coip/settings.py
+++ b/coip/settings.py
@@ -1,5 +1,7 @@
# Django settings for coip project.
+import coip.site_logging
+
DEBUG = True
TEMPLATE_DEBUG = DEBUG
diff --git a/coip/site_logging.py b/coip/site_logging.py
new file mode 100644
index 0000000..cdbe3c2
--- /dev/null
+++ b/coip/site_logging.py
@@ -0,0 +1,10 @@
+import logging
+import sys
+
+logger = logging.getLogger('')
+logger.setLevel(logging.DEBUG)
+handler = logging.StreamHandler(sys.stderr)
+handler.setLevel(logging.DEBUG)
+formatter = logging.Formatter('%(levelname)-8s %(message)s')
+handler.setFormatter(formatter)
+logger.addHandler(handler)