X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/92ff4af75a2e0defd8989e6b29e39196f790d16c..bf3f18ce9313f4929ff327fbf12803157de171cb:/apps/stats/utils.py?ds=inline diff --git a/apps/stats/utils.py b/apps/stats/utils.py index 7ee4cfdbe..474d1b59a 100644 --- a/apps/stats/utils.py +++ b/apps/stats/utils.py @@ -1,23 +1,33 @@ - -from django.contrib.sites.models import Site -from piwik.django.models import PiwikSite +# -*- coding: utf-8 -*- +# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# from django.conf import settings +from datetime import datetime import logging from functools import update_wrapper -import httplib -import urlparse import urllib from random import random from inspect import isclass +from .tasks import track_request logger = logging.getLogger(__name__) -def piwik_url(**kw): - url = settings.PIWIK_URL + u"/piwik.php?" - url += u'&'.join([k + u"=" + str(v) for k, v in kw.items()]) - logger.info("piwik url: %s" % url) - return url +def piwik_url(request): + return urllib.urlencode(dict( + idsite=getattr(settings, 'PIWIK_SITE_ID', '0'), + rec=1, + url='http://%s%s' % (request.META['HTTP_HOST'], request.path), + rand=int(random() * 0x10000), + apiv=PIWIK_API_VERSION, + urlref=request.META.get('HTTP_REFERER', ''), + ua=request.META.get('HTTP_USER_AGENT', ''), + lang=request.META.get('HTTP_ACCEPT_LANGUAGE', ''), + token_auth=getattr(settings, 'PIWIK_TOKEN', ''), + cip=request.META['REMOTE_ADDR'], + cdt=datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + )) PIWIK_API_VERSION = 1 @@ -26,17 +36,9 @@ def piwik_track(klass_or_method): """Track decorated class or method using Piwik (according to configuration in settings and django-piwik) Works for handler classes (executed by __call__) or handler methods. Expects request to be the first parameter """ - # Retrieve piwik information - current_site = Site.objects.get_current() - piwik_site = PiwikSite.objects.filter(site=current_site.id) - - if len(piwik_site) == 0: - logger.debug("No PiwikSite is configured for Site " + current_site.name) + if not getattr(settings, 'PIWIK_SITE_ID', 0): return klass_or_method - id_piwik = piwik_site[0].id_site - host = urlparse.urlsplit(settings.PIWIK_URL).netloc - # get target method if isclass(klass_or_method): klass = klass_or_method @@ -45,18 +47,8 @@ def piwik_track(klass_or_method): call_func = klass_or_method def wrap(self, request, *args, **kw): - conn = httplib.HTTPConnection(host) - conn.request('GET', piwik_url( - rec=1, - apiv=PIWIK_API_VERSION, - rand=int(random() * 0x10000), - token_auth=urllib.quote(settings.PIWIK_TOKEN), - cip=urllib.quote(request.META['REMOTE_ADDR']), - url=urllib.quote('http://' + request.META['HTTP_HOST'] + request.path), - urlref=urllib.quote(request.META['HTTP_REFERER']) if 'HTTP_REFERER' in request.META else '', - idsite=id_piwik)) - - conn.close() + if getattr(request, 'piwik_track', True): + track_request.delay(piwik_url(request)) return call_func(self, request, *args, **kw) # and wrap it @@ -66,5 +58,4 @@ def piwik_track(klass_or_method): klass.__call__ = wrap return klass else: - print klass_or_method return wrap