Include code to hand array's of dictionaries

gnulnx · Jan 17, 2019 · bde6034 · bde6034
1 parent 20b0dc2
commit bde6034
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/mongolog/handlers.py b/mongolog/handlers.py
@@ -153,7 +153,7 @@ def check_keys(self, record):
         if not isinstance(record['msg'], dict):
             return record
 
-        for k, v in record['msg'].items():
+        for k, v in list(record['msg'].items()):
             self._check_keys(k, v, record['msg'])
 
         return record
@@ -165,9 +165,16 @@ def _check_keys(self, k, v, _dict):
         _dict[self.new_key(k)] = _dict.pop(k)
 
         if isinstance(v, dict):
-            for nk, vk in v.items():
+            for nk, vk in list(v.items()):
                 self._check_keys(nk, vk, v)
 
+        # We could also have an array of dictionaries so we check those as well.
+        if isinstance(v, list):
+            for l in v:
+                if isinstance(l, dict):
+                    for nk, vk in list(l.items()):
+                        self._check_keys(nk, vk, l)
+
     def new_key(self, key):
         """
         mongo < 3.6

diff --git a/mongolog/tests.py b/mongolog/tests.py
@@ -160,7 +160,7 @@ def test_middleware(self):
         response = c.get(reverse("home"))
         self.assertContains(response, "HERE YOU ARE ON monglog/home.html")
 
-    def test_dot_in_key(self):
+    def test_special_chars_in_key(self):
         console.debug(self)
         self.logger.info({
             'META': {
@@ -170,7 +170,11 @@ def test_dot_in_key(self):
                     'blah.blah': 'blah',
                     '$blah$blah': 'blah',
                     'array': [
-                        {'$test': 'test'}
+                        {
+                            '$test': 'test',
+                            'test$test': 'test',
+                            '.test.test': 'test',
+                        }
                     ],
                     'META3': {
                         'meta3.meta3': 'meta3',