Skip to content

Commit

Permalink
Use logging rather than print
Browse files Browse the repository at this point in the history
In production under mod_wsgi, one can't write to stdout.

prints in management commands left untouched.
  • Loading branch information
stefanor committed Mar 29, 2012
1 parent 902ec2f commit f875d21
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion djangopypi/forms.py
@@ -1,3 +1,4 @@
import logging
from os.path import basename

from django import forms
Expand All @@ -8,6 +9,8 @@
from djangopypi.models import Package, Classifier, Release, Distribution


log = logging.getLogger('djangopypi.forms')


class SimplePackageSearchForm(forms.Form):
query = forms.CharField(max_length=255)
Expand All @@ -31,7 +34,7 @@ def clean_content(self):
filename=content.name)

if not storage.exists(name):
print '%s does not exist' % (name,)
log.error('%s does not exist', name)
return content

if settings.DJANGOPYPI_ALLOW_VERSION_OVERWRITE:
Expand Down
7 changes: 5 additions & 2 deletions djangopypi/signals.py
@@ -1,8 +1,11 @@
import logging

from django.db.models import signals
from django.utils.hashcompat import md5_constructor

from djangopypi.models import Package, Release, Distribution

log = logging.getLogger('djangopypi.signals')

def autohide_new_release_handler(sender, instance, created, *args, **kwargs):
""" Autohide other releases on the creation of a new release when the
Expand Down Expand Up @@ -50,8 +53,8 @@ def distribution_hash(sender, instance, *args, **kwargs):
fh.close()
instance.md5_digest = digest.hexdigest()
instance.save()
except Exception, e:
print str(e)
except Exception:
log.exception("Error calculating hash")

signals.post_save.connect(autohide_new_release_handler, sender=Release)
signals.pre_save.connect(autohide_save_release_handler, sender=Release)
Expand Down
7 changes: 3 additions & 4 deletions djangopypi/utils.py
@@ -1,5 +1,4 @@
import sys, traceback

import logging


def debug(func):
Expand All @@ -8,5 +7,5 @@ def _wrapped(*args, **kwargs):
try:
return func(*args, **kwargs)
except:
traceback.print_exception(*sys.exc_info())
return _wrapped
logging.exception("@debug")
return _wrapped
2 changes: 1 addition & 1 deletion djangopypi/views/distutils.py
Expand Up @@ -155,7 +155,7 @@ def register_or_upload(request):
md5_digest=md5_digest)
except Exception, e:
transaction.rollback()
print str(e)
log.exception('Failure when storing upload')

transaction.commit()

Expand Down

0 comments on commit f875d21

Please sign in to comment.