Merge a0fba34 into ab74e01

garelay/settings/base.py

@@ -115,6 +115,9 @@
     environ.get('GARELAY_REGISTER_BATCH_SIZE') or 1000)
 GARELAY_RELAY_TIMEOUT = int(
     environ.get('GARELAY_RELAY_TIMEOUT') or 10)
+GARELAY_SESSION_AGE = int(
+    environ.get('GARELAY_SESSION_AGE') or
+    timedelta(days=365 * 2).total_seconds())
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/

garelay/tracker/tests/test_views.py

@@ -1,4 +1,5 @@
 import json
+from datetime import timedelta
 
 from django.test import TestCase
 from django.test.client import Client
@@ -41,6 +42,10 @@ def test_tracking_event(self):
         self.assertFalse(event.registered_at)
         self.assertEqual(event.tracking_id, 'UA-F00-1')
         self.assertEqual(event.client_id, self.client.session['tracker_uuid'])
+        self.assertEqual(
+            timedelta(seconds=self.client.session.get_expiry_age()).days,
+            365 * 2,  # default session age is set to two years
+        )
         self.assertEqual(event.user_agent, 'The Agent')
         self.assertEqual(event.status, 'captured')
         self.assertEqual(json.loads(event.data), {

garelay/tracker/views.py

@@ -4,6 +4,7 @@
 from django.http import HttpResponse
 from django.views.decorators.cache import never_cache
 from django.utils import timezone
+from django.conf import settings
 
 from .models import TrackingEvent
 
@@ -18,6 +19,7 @@ def get_tracker_uuid(request):
 
 @never_cache
 def tracker(request, tracking_id, path):
+    request.session.set_expiry(settings.GARELAY_SESSION_AGE)
     client_id = get_tracker_uuid(request)
     data = {
         'dp': path,