Merge branch 'mnoman/log_event_notification' into rashid/forwarding_event_processor

Author: mariamjamal94

optimizely/event/event_processor.py

@@ -48,8 +48,8 @@ class BatchEventProcessor(EventProcessor, Closeable):
 
   _DEFAULT_QUEUE_CAPACITY = 1000
   _DEFAULT_BATCH_SIZE = 10
-  _DEFAULT_FLUSH_INTERVAL = timedelta(seconds=30)
-  _DEFAULT_TIMEOUT_INTERVAL = timedelta(seconds=5)
+  _DEFAULT_FLUSH_INTERVAL = timedelta(milliseconds=30000)
+  _DEFAULT_TIMEOUT_INTERVAL = timedelta(milliseconds=5000)
   _SHUTDOWN_SIGNAL = object()
   _FLUSH_SIGNAL = object()
   LOCK = threading.Lock()
@@ -91,7 +91,8 @@ def disposed(self):
     return self._disposed
 
   def _validate_intantiation_props(self, prop, prop_name):
-    if prop is None or not isinstance(prop, int) or prop < 1 or not validator.is_finite_number(prop):
+    if (prop_name == 'batch_size' and not isinstance(prop, int)) or prop is None or prop < 1 or \
+      not validator.is_finite_number(prop):
       self.logger.info('Using default value for {}.'.format(prop_name))
       return False
 

tests/test_event_processor.py

@@ -288,7 +288,7 @@ def test_init__invalid_batch_size(self):
                                                   self.optimizely.logger,
                                                   True,
                                                   self.event_queue,
-                                                  -5,
+                                                  5.5,
                                                   self.MAX_DURATION_MS,
                                                   self.MAX_TIMEOUT_INTERVAL_MS
                                                   )
@@ -328,7 +328,7 @@ def test_init__invalid_flush_interval(self):
                                                   )
 
     # default flush interval is 30s.
-    self.assertEqual(self._event_processor.flush_interval, timedelta(seconds=30))
+    self.assertEqual(self._event_processor.flush_interval, timedelta(milliseconds=30000))
     mock_config_logging.info.assert_called_with('Using default value for flush_interval.')
 
   def test_init__NaN_flush_interval(self):
@@ -345,7 +345,7 @@ def test_init__NaN_flush_interval(self):
                                                   )
 
     # default flush interval is 30s.
-    self.assertEqual(self._event_processor.flush_interval, timedelta(seconds=30))
+    self.assertEqual(self._event_processor.flush_interval, timedelta(milliseconds=30000))
     mock_config_logging.info.assert_called_with('Using default value for flush_interval.')
 
   def test_init__invalid_timeout_interval(self):
@@ -362,7 +362,7 @@ def test_init__invalid_timeout_interval(self):
                                                   )
 
     # default timeout interval is 5s.
-    self.assertEqual(self._event_processor.timeout_interval, timedelta(seconds=5))
+    self.assertEqual(self._event_processor.timeout_interval, timedelta(milliseconds=5000))
     mock_config_logging.info.assert_called_with('Using default value for timeout_interval.')
 
   def test_init__NaN_timeout_interval(self):
@@ -379,7 +379,7 @@ def test_init__NaN_timeout_interval(self):
                                                   )
 
     # default timeout interval is 5s.
-    self.assertEqual(self._event_processor.timeout_interval, timedelta(seconds=5))
+    self.assertEqual(self._event_processor.timeout_interval, timedelta(milliseconds=5000))
     mock_config_logging.info.assert_called_with('Using default value for timeout_interval.')
 
   def test_notification_center(self):