@@ -78,6 +78,9 @@ def _get_config_sets(self):
78
78
def _check_exit_conditions (self , till , rbs_till , change_number , rbs_change_number ):
79
79
return (till is not None and till < change_number ) or (rbs_till is not None and rbs_till < rbs_change_number )
80
80
81
+ def _check_return_conditions (self , feature_flag_changes ):
82
+ return feature_flag_changes .get ('ff' )['t' ] == feature_flag_changes .get ('ff' )['s' ] and feature_flag_changes .get ('rbs' )['t' ] == feature_flag_changes .get ('rbs' )['s' ]
83
+
81
84
class SplitSynchronizer (SplitSynchronizerBase ):
82
85
"""Feature Flag changes synchronizer."""
83
86
@@ -145,7 +148,7 @@ def _fetch_until(self, fetch_options, till=None, rbs_till=None):
145
148
segment_list .update (update_feature_flag_storage (self ._feature_flag_storage , fetched_feature_flags , feature_flag_changes .get ('ff' )['t' ], self ._api .clear_storage ))
146
149
segment_list .update (rbs_segment_list )
147
150
148
- if feature_flag_changes . get ( 'ff' )[ 't' ] == feature_flag_changes . get ( 'ff' )[ 's' ] and feature_flag_changes . get ( 'rbs' )[ 't' ] == feature_flag_changes . get ( 'rbs' )[ 's' ] :
151
+ if self . _check_return_conditions ( feature_flag_changes ) :
149
152
return feature_flag_changes .get ('ff' )['t' ], feature_flag_changes .get ('rbs' )['t' ], segment_list
150
153
151
154
def _attempt_feature_flag_sync (self , fetch_options , till = None , rbs_till = None ):
@@ -304,7 +307,7 @@ async def _fetch_until(self, fetch_options, till=None, rbs_till=None):
304
307
segment_list = await update_feature_flag_storage_async (self ._feature_flag_storage , fetched_feature_flags , feature_flag_changes .get ('ff' )['t' ], self ._api .clear_storage )
305
308
segment_list .update (rbs_segment_list )
306
309
307
- if feature_flag_changes . get ( 'ff' )[ 't' ] == feature_flag_changes . get ( 'ff' )[ 's' ] and feature_flag_changes . get ( 'rbs' )[ 't' ] == feature_flag_changes . get ( 'rbs' )[ 's' ] :
310
+ if self . _check_return_conditions ( feature_flag_changes ) :
308
311
return feature_flag_changes .get ('ff' )['t' ], feature_flag_changes .get ('rbs' )['t' ], segment_list
309
312
310
313
async def _attempt_feature_flag_sync (self , fetch_options , till = None , rbs_till = None ):
0 commit comments