Additional debug information on getJson

main
Bob Mottram 2021-06-18 12:53:25 +01:00
parent c2bc98d4de
commit cdd0f91dfb
2 changed files with 18 additions and 1 deletions

3
pgp.py
View File

@ -478,7 +478,8 @@ def pgpPublicKeyUpload(baseDir: str, session,
if debug: if debug:
print('Getting actor for ' + handle) print('Getting actor for ' + handle)
actorJson, asHeader = getActorJson(handle, False, False, debug, True) actorJson, asHeader = \
getActorJson(domain, handle, False, False, debug, True)
if not actorJson: if not actorJson:
if debug: if debug:
print('No actor returned for ' + handle) print('No actor returned for ' + handle)

View File

@ -13,6 +13,7 @@ from utils import urlPermitted
import json import json
from socket import error as SocketError from socket import error as SocketError
import errno import errno
from http.client import HTTPConnection
baseDirectory = None baseDirectory = None
@ -104,9 +105,24 @@ def getJson(session, url: str, headers: {}, params: {}, debug: bool,
if not quiet: if not quiet:
print('WARN: getJson failed, no session specified for getJson') print('WARN: getJson failed, no session specified for getJson')
return None return None
if debug:
HTTPConnection.debuglevel = 1
try: try:
result = session.get(url, headers=sessionHeaders, result = session.get(url, headers=sessionHeaders,
params=sessionParams, timeout=timeoutSec) params=sessionParams, timeout=timeoutSec)
if result.status_code != 200:
if result.status_code == 401:
print('WARN: getJson Unauthorized url: ' + url)
elif result.status_code == 403:
print('WARN: getJson Forbidden url: ' + url)
elif result.status_code == 404:
print('WARN: getJson Not Found url: ' + url)
elif result.status_code != 200:
print('WARN: getJson url: ' + url +
' failed with error code ' +
str(result.status_code))
return result.json() return result.json()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
sessionHeaders2 = sessionHeaders.copy() sessionHeaders2 = sessionHeaders.copy()