Ensure new modified date is used in state

lists:ukeymerge had reversed arguments, so the old value was always used

Added some Django debug logging in the example code

Fixes #68

Author: lukebakken

examples/rabbitmq_trust_store_django/.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 *.sqlite3
-certs/*
+certs/
+venv/

examples/rabbitmq_trust_store_django/rabbitmq_trust_store_django/settings.py

@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
 
+import logging.config
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -27,6 +28,36 @@
 
 ALLOWED_HOSTS = []
 
+logging.config.dictConfig({
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
+            'style': '{',
+        },
+        'simple': {
+            'format': '{levelname} {message}',
+            'style': '{',
+        },
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': os.getenv('DJANGO_LOG_LEVEL', 'DEBUG'),
+        },
+        'rabbitmq_trust_store_django': {
+            'handlers': ['console'],
+            'level': os.getenv('DJANGO_LOG_LEVEL', 'DEBUG'),
+        }
+    },
+})
 
 # Application definition
 

examples/rabbitmq_trust_store_django/rabbitmq_trust_store_django/trust_store/views.py

@@ -1,14 +1,19 @@
+import logging
+import os
+
 from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse
-import os
 from django.conf import settings
 from django.views.decorators.http import last_modified
 from datetime import datetime
 
+logger = logging.getLogger(__name__)
 
 def latest_dir_change(request):
     timestamp = os.stat(cert_directory()).st_mtime
-    return datetime.fromtimestamp(timestamp)
+    dt = datetime.fromtimestamp(timestamp)
+    logger.debug('latest_dir_change: %s', dt)
+    return dt
 
 @last_modified(latest_dir_change)
 def index(request):

src/rabbit_trust_store_http_provider.erl

@@ -78,23 +78,13 @@ decode_cert_list(Body) ->
         end,
         Certs).
 
-new_state(RespHeaders, #http_state{headers = Headers} = State) ->
-    LastModified = proplists:get_value("Last-Modified",
-                                       RespHeaders,
-                                       proplists:get_value("last-modified",
-                                                           RespHeaders,
-                                                           undefined)),
-    case LastModified of
+new_state(RespHeaders, #http_state{headers = Headers0} = State) ->
+    LastModified0 = proplists:get_value("last-modified", RespHeaders),
+    LastModified1 = proplists:get_value("Last-Modified", RespHeaders, LastModified0),
+    case LastModified1 of
         undefined -> State;
         Value     ->
-            NewHeaders = lists:ukeymerge(1, Headers,
-                                            [{"If-Modified-Since", Value}]),
+            Headers1 = lists:ukeysort(1, Headers0),
+            NewHeaders = lists:ukeymerge(1, [{"If-Modified-Since", Value}], Headers1),
             State#http_state{headers = NewHeaders}
     end.
-
-
-
-
-
-
-