minor fixes and polishing

Author: chillaq

splitio/client/client.py

@@ -370,7 +370,7 @@ def track(self, key, traffic_type, event_type, value=None, properties=None):
             _LOGGER.error("Client is not ready - no calls possible")
             return False
         if not self.ready:
-            _LOGGER.warn("track: the SDK is not ready, results may be incorrect. Make sure to wait for SDK readiness before using this method")
+            _LOGGER.warning("track: the SDK is not ready, results may be incorrect. Make sure to wait for SDK readiness before using this method")
             self._telemetry_init_producer.record_not_ready_usage()
 
         start = get_current_epoch_time_ms()

splitio/client/config.py

@@ -126,6 +126,7 @@ def sanitize(apikey, config):
     processed['impressionsMode'] = imp_mode
     processed['impressionsRefreshRate'] = imp_rate
     if processed['metricsRefreshRate'] < 60:
-        processed['metricsRefreshRate'] = 60
+        _LOGGER.warning('metricRefreshRate parameter minimum value is 60 seconds, defaulting to 3600 seconds.')
+        processed['metricsRefreshRate'] = 3600
 
     return processed

splitio/client/factory.py

@@ -525,18 +525,18 @@ def _build_localhost_factory(cfg):
         'impressions': LocalhostImpressionsStorage(),
         'events': LocalhostEventsStorage(),
     }
-
+    localhost_mode = LocalhostMode.JSON if cfg['splitFile'][-5:].lower() == '.json' else LocalhostMode.LEGACY
     synchronizers = SplitSynchronizers(
         LocalSplitSynchronizer(cfg['splitFile'],
                                storages['splits'],
-                               LocalhostMode.JSON if cfg['splitFile'][-5:].lower() == '.json' else LocalhostMode.LEGACY),
+                               localhost_mode),
         LocalSegmentSynchronizer(cfg['segmentDirectory'], storages['splits'], storages['segments']),
         None, None, None,
     )
 
     split_sync_task = None
     segment_sync_task = None
-    if cfg['localhostRefreshEnabled']:
+    if cfg['localhostRefreshEnabled'] and localhost_mode == LocalhostMode.JSON:
         split_sync_task = SplitSynchronizationTask(
             synchronizers.split_sync.synchronize_splits,
             cfg['featuresRefreshRate'],

splitio/sync/split.py

@@ -23,7 +23,7 @@
 
 
 _ON_DEMAND_FETCH_BACKOFF_BASE = 10  # backoff base starting at 10 seconds
-_ON_DEMAND_FETCH_BACKOFF_MAX_WAIT = 30  # don't sleep for more than 1 minute
+_ON_DEMAND_FETCH_BACKOFF_MAX_WAIT = 30  # don't sleep for more than 30 seconds
 _ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES = 10
 
 
@@ -481,15 +481,19 @@ def _santizie_condition(self, split):
         found_all_keys_matcher = False
         if 'conditions' not in split or split['conditions'] is None:
             split['conditions'] = []
+        conditions_count = len(split['conditions'])
+        count = 0
         for condition in split['conditions']:
-            if 'conditionType' in condition:
-                if condition['conditionType'] == 'ROLLOUT':
-                    if 'matcherGroup' in condition:
-                        if 'matchers' in condition['matcherGroup']:
-                            for matcher in condition['matcherGroup']['matchers']:
-                                if matcher['matcherType'] == 'ALL_KEYS':
-                                    found_all_keys_matcher = True
-                                    break
+            count += 1
+            if count == conditions_count: # checking only last condition
+                if 'conditionType' in condition:
+                    if condition['conditionType'] == 'ROLLOUT':
+                        if 'matcherGroup' in condition:
+                            if 'matchers' in condition['matcherGroup']:
+                                for matcher in condition['matcherGroup']['matchers']:
+                                    if matcher['matcherType'] == 'ALL_KEYS':
+                                        found_all_keys_matcher = True
+                                        break
 
         if not found_all_keys_matcher:
             _LOGGER.debug("Missing default rule condition for split: %s, adding default rule with 100%% off treatment", split['name'])

tests/integration/test_client_e2e.py

@@ -1018,6 +1018,7 @@ def test_localhost_json_e2e(self):
         assert client.get_treatment("key", "SPLIT_2", None) == 'on'
 
         # Tests 2
+        factory._storages['splits'].remove('SPLIT_1')
         factory._storages['splits'].remove('SPLIT_2')
         factory._sync_manager._synchronizer._split_synchronizers._split_sync._split_storage.set_change_number(-1)
         self._update_temp_file(splits_json['splitChange2_1'])
@@ -1066,6 +1067,7 @@ def test_localhost_json_e2e(self):
         assert client.get_treatment("key", "SPLIT_2", None) == 'on'
 
         # Tests 5
+        factory._storages['splits'].remove('SPLIT_1')
         factory._storages['splits'].remove('SPLIT_2')
         factory._sync_manager._synchronizer._split_synchronizers._split_sync._split_storage.set_change_number(-1)
         self._update_temp_file(splits_json['splitChange5_1'])