From 9c187ee1f98fae81751035e1c5e93c78abb59da0 Mon Sep 17 00:00:00 2001 From: Christopher Dignam Date: Sat, 6 Jun 2020 11:22:34 -0400 Subject: [PATCH] fix(bot): logging about unexpected blocker (#417) When the seats_exceeded subscription blocker was set and the user was an allowed user we would erroneously log a warning about an unexpected subscription status. --- bot/kodiak/evaluation.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bot/kodiak/evaluation.py b/bot/kodiak/evaluation.py index aa8ac02e0..0de50f159 100644 --- a/bot/kodiak/evaluation.py +++ b/bot/kodiak/evaluation.py @@ -233,6 +233,7 @@ def missing_push_allowance(push_allowances: List[PushAllowance]) -> bool: def get_paywall_status_for_blocker( pull_request: PullRequest, subscription_blocker: Union[SubscriptionExpired, TrialExpired, SeatsExceeded], + log: structlog.BoundLogger, ) -> Optional[str]: if isinstance(subscription_blocker, SeatsExceeded): if pull_request.author.databaseId in subscription_blocker.allowed_user_ids: @@ -242,6 +243,7 @@ def get_paywall_status_for_blocker( return "trial ended" if isinstance(subscription_blocker, SubscriptionExpired): return "subscription expired" + log.warning("unexpected subscription_blocker %s ", subscription_blocker) return None @@ -379,7 +381,7 @@ async def set_status(msg: str, markdown_content: Optional[str] = None) -> None: # We also ignore missing subscriptions. The web api will set # subscription blockers if usage exceeds limits. status_message = get_paywall_status_for_blocker( - pull_request, subscription.subscription_blocker + pull_request, subscription.subscription_blocker, log ) if status_message is not None: await set_status( @@ -387,9 +389,6 @@ async def set_status(msg: str, markdown_content: Optional[str] = None) -> None: markdown_content=get_markdown_for_paywall(), ) return - log.warning( - "unexpected subscription_blocker %s ", subscription.subscription_blocker - ) if ( pull_request.author.login in config.approve.auto_approve_usernames