Ottomata has submitted this change and it was merged. Change subject: Convert api_version to tuple for kafka-python handlers ......................................................................
Convert api_version to tuple for kafka-python handlers See: https://github.com/dpkp/kafka-python/blob/master/kafka/client_async.py#L78-L84 Change-Id: I196983f697e57b8d8b71fdb0e8d1b8229512e598 --- M eventlogging/handlers.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/eventlogging/handlers.py b/eventlogging/handlers.py index 4b6ff3d..1971c1d 100644 --- a/eventlogging/handlers.py +++ b/eventlogging/handlers.py @@ -163,9 +163,12 @@ if not async and 'batch_size' not in kafka_args: kafka_args['batch_size'] = 0 - # If specifying api_version, it should be a string! + # kafka-python expects api_version to be a tuple of ints. + # Convert the semvar string. if 'api_version' in kafka_args: - kafka_args['api_version'] = str(kafka_args['api_version']) + kafka_args['api_version'] = tuple( + [int(i) for i in str(kafka_args['api_version']).split('.')] + ) # Set default retries to 3. if 'retries' not in kafka_args: @@ -665,6 +668,13 @@ if k in KafkaConsumer.DEFAULT_CONFIG } + # kafka-python expects api_version to be a tuple of ints. + # Convert the semvar string. + if 'api_version' in kafka_args: + kafka_args['api_version'] = tuple( + [int(i) for i in str(kafka_args['api_version']).split('.')] + ) + # Be flexible with auto_offset_reset values. The enum names # have changed in different clients and versions, but the int # values have never changed. Allow setting this by int value on -- To view, visit https://gerrit.wikimedia.org/r/324751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I196983f697e57b8d8b71fdb0e8d1b8229512e598 Gerrit-PatchSet: 3 Gerrit-Project: eventlogging Gerrit-Branch: master Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
