Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents 514437ff 703bf89c
Showing 3 changed files with 14 additions and 8 deletions Show diff stats
src/hitcount/models.py
src/hitcount/views.py
src/super_archives/views.py
@@ -45,7 +45,11 @@ class HitCountModelMixin(object):
             cache.set(cache_key, True)
  
         # Everything ok, so just increment the page count
-        hit_ = Hit.objects.get_or_create(content_type=content_type,
-                                         object_pk=self.pk)[0]
-        hit_.hits += 1
-        hit_.save()
+        hit_pk = Hit.objects.get_or_create(content_type=content_type,
+                                           object_pk=self.pk)[0].pk
+
+        # Using this way instead of hits += 1 forces django to
+        #   call the UPDATE directly in the database avoiding
+        #   cuncurrency problems
+        Hit.objects.filter(pk=hit_pk).update(hits=models.F("hits") + 1)
+
 from django.shortcuts import render
  
 class HitCountViewMixin(object):
-    def get_object(self):
-        raise NotImplementedError
+    def get_object(self, *args, **kwargs):
+        try:
+            super(HitCountViewMixin, self).get_object(*args, **kwargs)
+        except AttributeError:
+            raise NotImplementedError
  
     def dispatch(self, request, *args, **kwargs):
         response = super(HitCountViewMixin, self).dispatch(request,
@@ -30,8 +30,7 @@ def thread(request, mailinglist, thread_token):
  
     thread = Thread.objects.get(subject_token=thread_token,
                                 mailinglist__name=mailinglist)
-
-    thread.hit()
+    thread.hit(request)
  
     order_by = request.GET.get('order')
     if order_by == 'voted':
...	...	@@ -45,7 +45,11 @@ class HitCountModelMixin(object):
45	45	cache.set(cache_key, True)
46	46
47	47	# Everything ok, so just increment the page count
48		- hit_ = Hit.objects.get_or_create(content_type=content_type,
49		- object_pk=self.pk)[0]
50		- hit_.hits += 1
51		- hit_.save()
	48	+ hit_pk = Hit.objects.get_or_create(content_type=content_type,
	49	+ object_pk=self.pk)[0].pk
	50	+
	51	+ # Using this way instead of hits += 1 forces django to
	52	+ # call the UPDATE directly in the database avoiding
	53	+ # cuncurrency problems
	54	+ Hit.objects.filter(pk=hit_pk).update(hits=models.F("hits") + 1)
	55	+
...	...
1	1	from django.shortcuts import render
2	2
3	3	class HitCountViewMixin(object):
4		- def get_object(self):
5		- raise NotImplementedError
	4	+ def get_object(self, args, *kwargs):
	5	+ try:
	6	+ super(HitCountViewMixin, self).get_object(args, *kwargs)
	7	+ except AttributeError:
	8	+ raise NotImplementedError
6	9
7	10	def dispatch(self, request, args, *kwargs):
8	11	response = super(HitCountViewMixin, self).dispatch(request,
...	...
...	...	@@ -30,8 +30,7 @@ def thread(request, mailinglist, thread_token):
30	30
31	31	thread = Thread.objects.get(subject_token=thread_token,
32	32	mailinglist__name=mailinglist)
33		-
34		- thread.hit()
	33	+ thread.hit(request)
35	34
36	35	order_by = request.GET.get('order')
37	36	if order_by == 'voted':
...	...