From 93a33ac7977167016fa92aa93974eb85f7211cba Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Wed, 8 Aug 2018 17:18:30 +0200 Subject: [PATCH] Drop logging, will make debugging easier Signed-off-by: Pierre-Yves Chibon --- .../files/flag_commit_build.py | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/playbooks/roles/flag_build_commits/files/flag_commit_build.py b/playbooks/roles/flag_build_commits/files/flag_commit_build.py index 2e273b4..4fc3ed2 100644 --- a/playbooks/roles/flag_build_commits/files/flag_commit_build.py +++ b/playbooks/roles/flag_build_commits/files/flag_commit_build.py @@ -13,7 +13,6 @@ Authors: Pierre-Yves Chibon from __future__ import unicode_literals import json -import logging import os import sys @@ -22,9 +21,6 @@ import requests from requests.packages.urllib3.util import retry -_log = logging.getLogger(__name__) - - def _koji_hub_link(msg): instance = msg.get('instance', 'primary') if instance == 'primary': @@ -73,7 +69,7 @@ def main(msg): request = msg['request'][0] instance = msg['instance'] if instance != 'primary': - _log.info("Ignoring secondary arch task...") + print("Ignoring secondary arch task...") return # see koji.TASK_STATES for all values @@ -84,11 +80,11 @@ def main(msg): } state = msg['new'] if state not in done_states: - _log.info('Build is still in progress, let\'s come back later') + print('Build is still in progress, let\'s come back later') return koji_url = _koji_hub_link(msg) - _log.info('Talking to koji at: %s' % koji_url) + print('Talking to koji at: %s' % koji_url) koji_client = koji.ClientSession(koji_url) build_id = msg['build_id'] @@ -97,13 +93,13 @@ def main(msg): build.get('extra') or {}).get('source', {}).get('original_url') if not git_url: - _log.info( - 'No git url found in the extra information: %s', + print( + 'No git url found in the extra information: %s' % build.get('extra')) return 1 if '#' not in git_url: - _log.info('No # in the git_url: %s', git_url) + print('No # in the git_url: %s' % git_url) return 1 commit = git_url.rsplit('#', 1)[1] @@ -147,14 +143,14 @@ def main(msg): 'flag' ]) flag_url = pagure_url + '/' + target_url - _log.info('Flagging commit at: %s' % flag_url) + print('Flagging commit at: %s' % flag_url) headers = { "Authorization": "token " + os.environ.get(env_var), 'User-Agent': 'loopabull@fedora-infr', } - _log.info('payload: %s' % data) + print('payload: %s' % data) req = requests_session.request( method='POST', @@ -162,14 +158,13 @@ def main(msg): headers=headers, data=data, ) - _log.info('Request to %s returned: %s' % (pagure_url, req.status_code)) - _log.debug(req.text) + print('Request to %s returned: %s' % (pagure_url, req.status_code)) if not req.ok: - _log.info(req.text) + print(req.text) return 1 else: - _log.info('All clear') - _log.info('User-URL: %s' % pagure_url + '/' + '/'.join([ + print('All clear') + print('User-URL: %s' % pagure_url + '/' + '/'.join([ 'rpms', msg['name'], 'c',