Merge pull request #2731 from coreos-inc/notification-enable-event

Fix log for reenabling a notification
This commit is contained in:
josephschorr 2017-06-27 18:36:25 +03:00 committed by GitHub
commit 6a7722cadb
2 changed files with 8 additions and 5 deletions

View file

@ -139,8 +139,9 @@ def reset_notification_number_of_failures(namespace_name, repository_name, uuid)
notification.repository.name != repository_name): notification.repository.name != repository_name):
raise InvalidNotificationException('No repository notification found with uuid: %s' % uuid) raise InvalidNotificationException('No repository notification found with uuid: %s' % uuid)
reset_number_of_failures_to_zero(notification.id) reset_number_of_failures_to_zero(notification.id)
return notification
except RepositoryNotification.DoesNotExist: except RepositoryNotification.DoesNotExist:
pass return None
def reset_number_of_failures_to_zero(notification_id): def reset_number_of_failures_to_zero(notification_id):

View file

@ -161,10 +161,12 @@ class RepositoryNotification(RepositoryParamResource):
@disallow_for_app_repositories @disallow_for_app_repositories
def post(self, namespace, repository, uuid): def post(self, namespace, repository, uuid):
""" Resets repository notification to 0 failures. """ """ Resets repository notification to 0 failures. """
model.notification.reset_notification_number_of_failures(namespace, repository, uuid) reset = model.notification.reset_notification_number_of_failures(namespace, repository, uuid)
log_action('reset_repo_notification', namespace, if reset is not None:
{'repo': repository, 'namespace': namespace, 'notification_id': uuid}, log_action('reset_repo_notification', namespace,
repo=model.repository.get_repository(namespace, repository)) {'repo': repository, 'namespace': namespace, 'notification_id': uuid,
'event': reset.event.name, 'method': reset.method.name},
repo=model.repository.get_repository(namespace, repository))
return 'No Content', 204 return 'No Content', 204