Infrastructure/loopabull-tasks
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop logging, will make debugging easier

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2018-08-08 17:18:30 +02:00
parent ff822d1d66
commit 93a33ac797
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
playbooks/roles/flag_build_commits/files/flag_commit_build.py
View file

@ -13,7 +13,6 @@ Authors: Pierre-Yves Chibon <pingou@pingoured.fr>
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
import logging
import os import os
import sys import sys
@ -22,9 +21,6 @@ import requests
from requests.packages.urllib3.util import retry from requests.packages.urllib3.util import retry
_log = logging.getLogger(__name__)
def _koji_hub_link(msg): def _koji_hub_link(msg):
instance = msg.get('instance', 'primary') instance = msg.get('instance', 'primary')
if instance == 'primary': if instance == 'primary':
@ -73,7 +69,7 @@ def main(msg):
request = msg['request'][0] request = msg['request'][0]
instance = msg['instance'] instance = msg['instance']
if instance != 'primary': if instance != 'primary':
_log.info("Ignoring secondary arch task...") print("Ignoring secondary arch task...")
return return
# see koji.TASK_STATES for all values # see koji.TASK_STATES for all values
@ -84,11 +80,11 @@ def main(msg):
} }
state = msg['new'] state = msg['new']
if state not in done_states: 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 return
koji_url = _koji_hub_link(msg) 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) koji_client = koji.ClientSession(koji_url)
build_id = msg['build_id'] build_id = msg['build_id']
@ -97,13 +93,13 @@ def main(msg):
build.get('extra') or {}).get('source', {}).get('original_url') build.get('extra') or {}).get('source', {}).get('original_url')
if not git_url: if not git_url:
_log.info( print(
'No git url found in the extra information: %s', 'No git url found in the extra information: %s' %
build.get('extra')) build.get('extra'))
return 1 return 1
if '#' not in git_url: 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 return 1
commit = git_url.rsplit('#', 1)[1] commit = git_url.rsplit('#', 1)[1]
@ -147,14 +143,14 @@ def main(msg):
'flag' 'flag'
]) ])
flag_url = pagure_url + '/' + target_url flag_url = pagure_url + '/' + target_url
_log.info('Flagging commit at: %s' % flag_url) print('Flagging commit at: %s' % flag_url)
headers = { headers = {
"Authorization": "token " + os.environ.get(env_var), "Authorization": "token " + os.environ.get(env_var),
'User-Agent': 'loopabull@fedora-infr', 'User-Agent': 'loopabull@fedora-infr',
} }
_log.info('payload: %s' % data) print('payload: %s' % data)
req = requests_session.request( req = requests_session.request(
method='POST', method='POST',
@ -162,14 +158,13 @@ def main(msg):
headers=headers, headers=headers,
data=data, data=data,
) )
_log.info('Request to %s returned: %s' % (pagure_url, req.status_code)) print('Request to %s returned: %s' % (pagure_url, req.status_code))
_log.debug(req.text)
if not req.ok: if not req.ok:
_log.info(req.text) print(req.text)
return 1 return 1
else: else:
_log.info('All clear') print('All clear')
_log.info('User-URL: %s' % pagure_url + '/' + '/'.join([ print('User-URL: %s' % pagure_url + '/' + '/'.join([
'rpms', 'rpms',
msg['name'], msg['name'],
'c', 'c',