Include sourceId in debug

merge-requests/30/head
Bob Mottram 2021-09-20 15:22:41 +01:00
parent 4a9ec1d3fb
commit ac248a9783
5 changed files with 10 additions and 8 deletions

View File

@ -406,7 +406,7 @@ def sendBookmarkViaServer(baseDir: str, session,
personCache, personCache,
projectVersion, httpPrefix, projectVersion, httpPrefix,
nickname, domain, nickname, domain,
postToBox, 52594) postToBox, 58391)
if not inboxUrl: if not inboxUrl:
if debug: if debug:

2
pgp.py
View File

@ -580,7 +580,7 @@ def pgpPublicKeyUpload(baseDir: str, session,
displayName) = getPersonBox(signingPrivateKeyPem, originDomain, displayName) = getPersonBox(signingPrivateKeyPem, originDomain,
baseDir, session, wfRequest, personCache, baseDir, session, wfRequest, personCache,
__version__, httpPrefix, nickname, __version__, httpPrefix, nickname,
domain, postToBox, 52025) domain, postToBox, 35725)
if not inboxUrl: if not inboxUrl:
if debug: if debug:

View File

@ -294,7 +294,8 @@ def _getPersonBoxActor(session, baseDir: str, actor: str,
debug: bool, projectVersion: str, debug: bool, projectVersion: str,
httpPrefix: str, domain: str, httpPrefix: str, domain: str,
personCache: {}, personCache: {},
signingPrivateKeyPem: str) -> {}: signingPrivateKeyPem: str,
sourceId: int) -> {}:
"""Returns the actor json for the given actor url """Returns the actor json for the given actor url
""" """
personJson = \ personJson = \
@ -318,7 +319,7 @@ def _getPersonBoxActor(session, baseDir: str, actor: str,
debug, projectVersion, httpPrefix, domain) debug, projectVersion, httpPrefix, domain)
if personJson: if personJson:
return personJson return personJson
print('Unable to get actor for ' + actor) print('Unable to get actor for ' + actor + ' ' + str(sourceId))
if not signingPrivateKeyPem: if not signingPrivateKeyPem:
print('No signing key provided when getting actor') print('No signing key provided when getting actor')
return None return None
@ -363,7 +364,8 @@ def getPersonBox(signingPrivateKeyPem: str, originDomain: str,
profileStr, asHeader, profileStr, asHeader,
debug, projectVersion, debug, projectVersion,
httpPrefix, originDomain, httpPrefix, originDomain,
personCache, signingPrivateKeyPem) personCache, signingPrivateKeyPem,
sourceId)
if not personJson: if not personJson:
return None, None, None, None, None, None, None return None, None, None, None, None, None, None

View File

@ -848,7 +848,7 @@ def sendWantedViaServer(baseDir, session,
personCache, projectVersion, personCache, projectVersion,
httpPrefix, fromNickname, httpPrefix, fromNickname,
fromDomain, postToBox, fromDomain, postToBox,
83653) 23653)
if not inboxUrl: if not inboxUrl:
if debug: if debug:
@ -953,7 +953,7 @@ def sendUndoWantedViaServer(baseDir: str, session,
personCache, projectVersion, personCache, projectVersion,
httpPrefix, fromNickname, httpPrefix, fromNickname,
fromDomain, postToBox, fromDomain, postToBox,
12663) 12693)
if not inboxUrl: if not inboxUrl:
if debug: if debug:

View File

@ -232,7 +232,7 @@ def sendSkillViaServer(baseDir: str, session, nickname: str, password: str,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, projectVersion, personCache, projectVersion,
httpPrefix, nickname, domain, httpPrefix, nickname, domain,
postToBox, 86725) postToBox, 76121)
if not inboxUrl: if not inboxUrl:
if debug: if debug: