Ottomata has submitted this change and it was merged. Change subject: Fix string and UUID type concatenation bug ......................................................................
Fix string and UUID type concatenation bug Related: https://gerrit.wikimedia.org/r/#/c/225480/ Change-Id: If0bdd5b39f953fb677502c534a6f35d60d8ec958 --- M server/eventlogging/handlers.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py index d9a19d4..39fd7ae 100644 --- a/server/eventlogging/handlers.py +++ b/server/eventlogging/handlers.py @@ -448,7 +448,7 @@ # If identity is empty create a default unique one. This ensures we don't # accidentally put consumers to the same group. Explicitly specify identity # to launch consumers in the same consumer group - identity = 'eventlogging-' + uuid.uuid1() if not identity else identity + identity = identity if identity else 'eventlogging-' + str(uuid.uuid1()) # Brokers should be in the uri path # path.strip returns type 'unicode' and pykafka expects a string, so -- To view, visit https://gerrit.wikimedia.org/r/231407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0bdd5b39f953fb677502c534a6f35d60d8ec958 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Madhuvishy <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
