Permalink
Browse files

Merge branch 'master' into deploy

  • Loading branch information...
2 parents fd43d16 + 57b2542 commit 01ebe717c81bba33be6baed98cb0adfb52770030 @domenkozar domenkozar committed Apr 8, 2012
Showing with 12 additions and 19 deletions.
  1. +0 −1 buildout.d/base.cfg
  2. +2 −3 buildout.d/versions.cfg
  3. +1 −0 intranet/localsettings.py.example
  4. +8 −13 intranet/settings.py
  5. +0 −1 intranet/urls.py
  6. +1 −1 setup.py
View
1 buildout.d/base.cfg
@@ -33,7 +33,6 @@ parts =
eggs =
Fabric
intranet
- django-sentry
# for this section see djangorecipe documentation
[django]
View
5 buildout.d/versions.cfg
@@ -7,7 +7,7 @@ django-localeurl = 1.4
djangorecipe = 0.99
django-grappelli = 2.3.3
django-haystack = 1.2.7
-django-reversion = 1.5.1
+django-reversion = 1.6.0
Fabric = 1.2.0
Feedjack = 0.9.16.1
feedparser = 5.0.1
@@ -36,7 +36,6 @@ z3c.recipe.usercrontab = 1.1
zc.buildout = 1.5.2
zc.recipe.egg = 1.3.2
buildout-versions = 1.6
-django-sentry = 1.13.5
django-indexer = 0.3.0
django-paging = 0.2.4
django-templatetag-sugar = 0.1
@@ -56,5 +55,5 @@ eventlet = 0.9.16
greenlet = 0.3.4
lockfile = 0.9.1
python-daemon = 1.6
-raven = 1.4.5
+raven = 1.5.0
requests = 0.10.6
View
1 intranet/localsettings.py.example
@@ -16,3 +16,4 @@ TEMPLATE_DEBUG = True
SEND_BROKEN_LINK_EMAILS = False
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
HAYSTACK_SOLR_URL = 'http://localhost:8983/solr/intranet/'
+SENTRY_DSN = '' # getsentry.com api key
View
21 intranet/settings.py
@@ -58,7 +58,7 @@ def next_to_this_file(this_file, additional_path):
)
MIDDLEWARE_CLASSES = (
- 'sentry.client.middleware.Sentry404CatchMiddleware', # must be first, to catch all good responses
+ 'raven.contrib.django.middleware.Sentry404CatchMiddleware',
'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
'localeurl.middleware.LocaleURLMiddleware',
'honeypot.middleware.HoneypotMiddleware', # as soon as possible
@@ -107,27 +107,27 @@ def next_to_this_file(this_file, additional_path):
'pipa.gallery',
'honeypot',
'django_extensions',
- 'sentry',
- 'sentry.client',
+ 'raven.contrib.django',
'django_mailman',
'haystack', # http://charlesleifer.com/blog/solr-ubuntu-revisited/
)
LOGGING = {
'version': 1,
'disable_existing_loggers': True,
+ 'root': {
+ 'level': 'WARNING',
+ 'handlers': ['sentry', 'console'],
+ },
'formatters': {
'verbose': {
'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
},
- 'simple': {
- 'format': '%(levelname)s %(message)s'
- },
},
'handlers': {
'sentry': {
- 'level': 'DEBUG',
- 'class': 'sentry.client.handlers.SentryHandler',
+ 'level': 'ERROR',
+ 'class': 'raven.contrib.django.handlers.SentryHandler',
'formatter': 'verbose'
},
'console': {
@@ -191,11 +191,6 @@ def next_to_this_file(this_file, additional_path):
SERVER_EMAIL = 'intranet@kiberpipa.org'
APPEND_SLASH = True
-TWITTER_SYNC = {
- 'keywords': ['kiberpipa'],
- 'users': ['Kiberpipa', 'FilmSteka', 'cyberpipe', 'MoMoSlo', 'wwwh'],
-}
-
# haystack
HAYSTACK_SEARCH_ENGINE = 'solr'
HAYSTACK_SITECONF = 'intranet.haystacksearch'
View
1 intranet/urls.py
@@ -34,7 +34,6 @@
(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
(r'^grappelli/', include('grappelli.urls')),
- (r'^sentry/', include('sentry.web.urls')),
)
if settings.DEBUG:
View
2 setup.py
@@ -55,7 +55,7 @@
# commands
'twitter',
# admin
- 'django-sentry',
+ 'raven',
'django-reversion',
],
tests_require=[

0 comments on commit 01ebe71

Please sign in to comment.