Merge pull request #9 from wkeeling/allow-logging-integers

Allow non-string messages to be concatenated
wkeeling · Apr 1, 2019 · a686cbc · a686cbc
2 parents 5258925 + 859023c
commit a686cbc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/ratelimitingfilter/ratelimitingfilter.py b/ratelimitingfilter/ratelimitingfilter.py
@@ -70,8 +70,11 @@ def filter(self, record):
         if bucket.consume():
             if bucket.limited > 0:
                 # Append a message to the record indicating the number of previously suppressed messages
-                record.msg += '{linesep}... {num} additional messages suppressed'.format(linesep=os.linesep,
-                                                                                         num=bucket.limited)
+                record.msg = '{msg}{linesep}... {num} additional messages suppressed'.format(
+                    msg=record.msg,
+                    linesep=os.linesep,
+                    num=bucket.limited
+                )
             bucket.limited = 0
             return True
 

diff --git a/tests/ratelimitingfilter_test.py b/tests/ratelimitingfilter_test.py
@@ -71,13 +71,19 @@ def test_limit_to_two_record_per_ten_second(self):
 
         self.assertEqual(result.count(True), 2)
 
+    def test_rate_limit_non_string(self):
+        f = RateLimitingFilter(rate=2, per=10)
+
+        result = self._filter_r_records_over_s_seconds(f, 20, 10, message=123)
+
+        self.assertEqual(result.count(True), 2)
+
     def _filter_twenty_records_over_two_seconds(self, f):
         return self._filter_r_records_over_s_seconds(f, 20, 2)
 
-
-    def _filter_r_records_over_s_seconds(self, f, nb_records, nb_seconds):
+    def _filter_r_records_over_s_seconds(self, f, nb_records, nb_seconds, message='test message'):
         mock_record = Mock()
-        mock_record.msg = 'test message'
+        mock_record.msg = message
 
         result = []