indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Convert exception to string

main2
Bob Mottram 2019-10-17 11:26:56 +01:00
parent 8b5376f616
commit c0361bd5bf
18 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
announce.py
View File

@ -76,7 +76,7 @@ def undoAnnounceCollectionEntry(postFilename: str,actor: str,debug: bool) -> Non
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception undoAnnounceCollectionEntry - '+e)
print('WARN: commentjson exception undoAnnounceCollectionEntry - '+str(e))
time.sleep(2)
tries+=1
if postJsonObject:
@ -138,7 +138,7 @@ def updateAnnounceCollection(postFilename: str,actor: str,debug: bool) -> None:
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception updateAnnounceCollection - '+e)
print('WARN: commentjson exception updateAnnounceCollection - '+str(e))
time.sleep(1)
tries+=1
if postJsonObject:

4
availability.py
View File

@ -35,7 +35,7 @@ def setAvailability(baseDir: str,nickname: str,domain: str, \
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setAvailability - '+e)
print('WARN: commentjson exception setAvailability - '+str(e))
time.sleep(1)
tries+=1
if actorJson:
@ -66,7 +66,7 @@ def getAvailability(baseDir: str,nickname: str,domain: str) -> str:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getAvailability - '+e)
print('WARN: commentjson exception getAvailability - '+str(e))
time.sleep(1)
tries+=1
if actorJson:

2
cache.py
View File

@ -53,7 +53,7 @@ def getPersonFromCache(baseDir: str,personUrl: str,personCache: {}) -> {}:
personJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getPersonFromCache - '+e)
print('WARN: commentjson exception getPersonFromCache - '+str(e))
print('ERROR: unable to load actor from cache '+cacheFilename+' try '+str(tries))
print(e)
time.sleep(1)

6
capabilities.py
View File

@ -134,7 +134,7 @@ def capabilitiesAccept(baseDir: str,httpPrefix: str, \
ocapAccept=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception capabilitiesAccept - '+e)
print('WARN: commentjson exception capabilitiesAccept - '+str(e))
time.sleep(1)
tries+=1
# otherwise create a new capability
@ -239,7 +239,7 @@ def capabilitiesUpdate(baseDir: str,httpPrefix: str, \
ocapJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception capabilitiesUpdate - '+e)
print('WARN: commentjson exception capabilitiesUpdate - '+str(e))
time.sleep(1)
tries+=1
@ -299,7 +299,7 @@ def capabilitiesReceiveUpdate(baseDir :str, \
ocapJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception capabilitiesReceiveUpdate - '+e)
print('WARN: commentjson exception capabilitiesReceiveUpdate - '+str(e))
time.sleep(1)
tries+=1

4
config.py
View File

@ -42,7 +42,7 @@ def setConfigParam(baseDir: str, variableName: str, variableValue) -> None:
configJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setConfigParam - '+e)
print('WARN: commentjson exception setConfigParam - '+str(e))
time.sleep(1)
tries+=1
configJson[variableName]=variableValue
@ -71,7 +71,7 @@ def getConfigParam(baseDir: str, variableName: str):
return configJson[variableName]
break
except Exception as e:
print('WARN: commentjson exception getConfigParam - '+e)
print('WARN: commentjson exception getConfigParam - '+str(e))
time.sleep(1)
tries+=1
return None

2
content.py
View File

@ -326,7 +326,7 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
print('emojiDict loaded on try '+str(emojiDictCtr))
break
except Exception as e:
print('WARN: commentjson exception addHtmlTags - '+e)
print('WARN: commentjson exception addHtmlTags - '+str(e))
print('Failed to load emoji (try '+str(emojiDictCtr)+'): '+baseDir+'/emoji/emoji.json '+str(e))
time.sleep(1)
emojiDictCtr+=1

12
daemon.py
View File

@ -1718,7 +1718,7 @@ class PubServer(BaseHTTPRequestHandler):
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception 1 - '+e)
print('WARN: commentjson exception 1 - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -1920,7 +1920,7 @@ class PubServer(BaseHTTPRequestHandler):
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception 2 - '+e)
print('WARN: commentjson exception 2 - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -1987,7 +1987,7 @@ class PubServer(BaseHTTPRequestHandler):
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception 3 - '+e)
print('WARN: commentjson exception 3 - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -2064,7 +2064,7 @@ class PubServer(BaseHTTPRequestHandler):
readPost=True
break
except Exception as e:
print('WARN: commentjson exception 4 - '+e)
print('WARN: commentjson exception 4 - '+str(e))
time.sleep(1)
tries+=1
if not readPost:
@ -3469,7 +3469,7 @@ class PubServer(BaseHTTPRequestHandler):
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception 5 - '+e)
print('WARN: commentjson exception 5 - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -4708,7 +4708,7 @@ def runDaemon(projectVersion, \
httpd.translate=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception 7 - '+e)
print('WARN: commentjson exception 7 - '+str(e))
print('ERROR while loading translations '+translationsFile)
print(e)
time.sleep(1)

4
follow.py
View File

@ -345,7 +345,7 @@ def followApprovalRequired(baseDir: str,nicknameToFollow: str, \
actor=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception followApprovalRequired - '+e)
print('WARN: commentjson exception followApprovalRequired - '+str(e))
time.sleep(1)
tries+=1
if actor:
@ -882,7 +882,7 @@ def getFollowersOfActor(baseDir :str,actor :str,debug: bool) -> {}:
ocapJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getFollowersOfActor - '+e)
print('WARN: commentjson exception getFollowersOfActor - '+str(e))
time.sleep(1)
tries+=1
if ocapJson:

14
inbox.py
View File

@ -327,7 +327,7 @@ def inboxCheckCapabilities(baseDir :str,nickname :str,domain :str, \
oc=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception inboxCheckCapabilities - '+e)
print('WARN: commentjson exception inboxCheckCapabilities - '+str(e))
time.sleep(1)
tries+=1
if not oc:
@ -404,7 +404,7 @@ def inboxPostRecipientsAdd(baseDir :str,httpPrefix :str,toList :[], \
loadedOcap=True
break
except Exception as e:
print('WARN: commentjson exception inboxPostRecipientsAdd - '+e)
print('WARN: commentjson exception inboxPostRecipientsAdd - '+str(e))
time.sleep(1)
tries+=1
if loadedOcap:
@ -695,7 +695,7 @@ def personReceiveUpdate(baseDir: str, \
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception personReceiveUpdate - '+e)
print('WARN: commentjson exception personReceiveUpdate - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -1111,7 +1111,7 @@ def receiveUndoAnnounce(session,handle: str,isGroup: bool,baseDir: str, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception receiveUndoAnnounce - '+e)
print('WARN: commentjson exception receiveUndoAnnounce - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -1301,7 +1301,7 @@ def groupHandle(baseDir: str,handle: str) -> bool:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception groupHandle - '+e)
print('WARN: commentjson exception groupHandle - '+str(e))
time.sleep(1)
tries+=1
if not actorJson:
@ -1322,7 +1322,7 @@ def getGroupName(baseDir: str,handle: str) -> str:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getGroupName - '+e)
print('WARN: commentjson exception getGroupName - '+str(e))
time.sleep(1)
tries+=1
if not actorJson:
@ -1706,7 +1706,7 @@ def runInboxQueue(projectVersion: str, \
queueJson=commentjson.load(fp)
except Exception as e:
itemReadFailed+=1
print('WARN: commentjson exception runInboxQueue - '+e)
print('WARN: commentjson exception runInboxQueue - '+str(e))
print('WARN: Failed to load inbox queue item '+queueFilename+' (try '+str(itemReadFailed)+')')
if itemReadFailed>4:
# After a few tries we can assume that the file

4
like.py
View File

@ -31,7 +31,7 @@ def undoLikesCollectionEntry(postFilename: str,objectUrl: str,actor: str,debug:
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception undoLikesCollectionEntry - '+e)
print('WARN: commentjson exception undoLikesCollectionEntry - '+str(e))
time.sleep(1)
tries+=1
@ -121,7 +121,7 @@ def updateLikesCollection(postFilename: str,objectUrl: str, actor: str,debug: bo
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception updateLikesCollection - '+e)
print('WARN: commentjson exception updateLikesCollection - '+str(e))
time.sleep(1)
tries+=1

2
manualapprove.py
View File

@ -105,7 +105,7 @@ def manualApproveFollowRequest(session,baseDir: str, \
followJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception manualApproveFollowRequest - '+e)
print('WARN: commentjson exception manualApproveFollowRequest - '+str(e))
time.sleep(1)
tries+=1
if followJson:

10
person.py
View File

@ -99,7 +99,7 @@ def setProfileImage(baseDir: str,httpPrefix :str,nickname: str,domain: str, \
personJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setProfileImage - '+e)
print('WARN: commentjson exception setProfileImage - '+str(e))
time.sleep(1)
tries+=1
@ -144,7 +144,7 @@ def setOrganizationScheme(baseDir: str,nickname: str,domain: str, \
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setOrganizationScheme - '+e)
print('WARN: commentjson exception setOrganizationScheme - '+str(e))
time.sleep(1)
tries+=1
@ -461,7 +461,7 @@ def personLookup(domain: str,path: str,baseDir: str) -> {}:
personJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception personLookup - '+e)
print('WARN: commentjson exception personLookup - '+str(e))
print('WARN: Failed to load actor '+filename)
time.sleep(1)
tries+=1
@ -586,7 +586,7 @@ def setDisplayNickname(baseDir: str,nickname: str, domain: str, \
personJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setDisplayNickname - '+e)
print('WARN: commentjson exception setDisplayNickname - '+str(e))
time.sleep(1)
tries+=1
@ -621,7 +621,7 @@ def setBio(baseDir: str,nickname: str, domain: str, bio: str) -> bool:
personJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setBio - '+e)
print('WARN: commentjson exception setBio - '+str(e))
time.sleep(1)
tries+=1

16
posts.py
View File

@ -529,7 +529,7 @@ def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \
replyToJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception createPostBase - '+e)
print('WARN: commentjson exception createPostBase - '+str(e))
time.sleep(1)
tries+=1
if replyToJson:
@ -585,7 +585,7 @@ def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \
capabilityIdList=[oc['id']]
break
except Exception as e:
print('WARN: commentjson exception createPostBase - '+e)
print('WARN: commentjson exception createPostBase - '+str(e))
time.sleep(1)
tries+=1
newPost = {
@ -1784,7 +1784,7 @@ def createModeration(baseDir: str,nickname: str,domain: str,port: int,httpPrefix
boxItems['orderedItems'].append(postJsonObject)
break
except Exception as e:
print('WARN: commentjson exception createModeration - '+e)
print('WARN: commentjson exception createModeration - '+str(e))
time.sleep(1)
tries+=1
@ -1946,7 +1946,7 @@ def createBoxBase(session,baseDir: str,boxname: str, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception createBoxBase - '+e)
print('WARN: commentjson exception createBoxBase - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -1974,7 +1974,7 @@ def createBoxBase(session,baseDir: str,boxname: str, \
loadedOcap=True
break
except Exception as e:
print('WARN: commentjson exception createBoxBase - '+e)
print('WARN: commentjson exception createBoxBase - '+str(e))
time.sleep(1)
tries+=1
if loadedOcap:
@ -2294,7 +2294,7 @@ def populateRepliesJson(baseDir: str,nickname: str,domain: str, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception populateRepliesJson - '+e)
print('WARN: commentjson exception populateRepliesJson - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -2330,7 +2330,7 @@ def populateRepliesJson(baseDir: str,nickname: str,domain: str, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception populateRepliesJson 2 - '+e)
print('WARN: commentjson exception populateRepliesJson 2 - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -2379,7 +2379,7 @@ def downloadAnnounce(session,baseDir: str,httpPrefix: str,nickname: str,domain:
postJsonObject=commentjson.load(fp)
return postJsonObject
except Exception as e:
print('WARN: commentjson exception downloadAnnounce - '+e)
print('WARN: commentjson exception downloadAnnounce - '+str(e))
time.sleep(1)
tries+=1
else:

6
roles.py
View File

@ -37,7 +37,7 @@ def clearModeratorStatus(baseDir: str) -> None:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception clearModeratorStatus - '+e)
print('WARN: commentjson exception clearModeratorStatus - '+str(e))
time.sleep(1)
tries+=1
@ -116,7 +116,7 @@ def setRole(baseDir: str,nickname: str,domain: str, \
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setRole - '+e)
print('WARN: commentjson exception setRole - '+str(e))
time.sleep(1)
tries+=1
@ -167,7 +167,7 @@ def getRoles(baseDir: str,nickname: str,domain: str, \
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getRoles - '+e)
print('WARN: commentjson exception getRoles - '+str(e))
time.sleep(1)
tries+=1

12
shares.py
View File

@ -33,7 +33,7 @@ def removeShare(baseDir: str,nickname: str,domain: str, \
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception removeShare - '+e)
print('WARN: commentjson exception removeShare - '+str(e))
time.sleep(1)
tries+=1
@ -83,7 +83,7 @@ def addShare(baseDir: str, \
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception addShare - '+e)
print('WARN: commentjson exception addShare - '+str(e))
time.sleep(1)
tries+=1
@ -200,7 +200,7 @@ def expireSharesForAccount(baseDir: str,nickname: str,domain: str) -> None:
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception expireSharesForAccount - '+e)
print('WARN: commentjson exception expireSharesForAccount - '+str(e))
time.sleep(1)
tries+=1
if sharesJson:
@ -227,7 +227,7 @@ def expireSharesForAccount(baseDir: str,nickname: str,domain: str) -> None:
commentjson.dump(sharesJson, fp, indent=4, sort_keys=False)
break
except Exception as e:
print('WARN: commentjson exception expireSharesForAccount 2 - '+e)
print('WARN: commentjson exception expireSharesForAccount 2 - '+str(e))
time.sleep(1)
tries+=1
@ -288,7 +288,7 @@ def getSharesFeedForPerson(baseDir: str, \
noOfShares=len(sharesJson.items())
break
except Exception as e:
print('WARN: commentjson exception getSharesFeedForPerson - '+e)
print('WARN: commentjson exception getSharesFeedForPerson - '+str(e))
time.sleep(1)
tries+=1
shares = {
@ -326,7 +326,7 @@ def getSharesFeedForPerson(baseDir: str, \
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getSharesFeedForPerson 2 - '+e)
print('WARN: commentjson exception getSharesFeedForPerson 2 - '+str(e))
time.sleep(1)
tries+=1

6
skills.py
View File

@ -36,7 +36,7 @@ def setSkillLevel(baseDir: str,nickname: str,domain: str, \
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setSkillLevel - '+e)
print('WARN: commentjson exception setSkillLevel - '+str(e))
time.sleep(1)
tries+=1
@ -72,7 +72,7 @@ def setSkills(baseDir: str,nickname: str,domain: str,skills: {}) -> None:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception setSkills - '+e)
print('WARN: commentjson exception setSkills - '+str(e))
time.sleep(1)
tries+=1
@ -104,7 +104,7 @@ def getSkills(baseDir: str,nickname: str,domain: str) -> []:
actorJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getSkills - '+e)
print('WARN: commentjson exception getSkills - '+str(e))
time.sleep(1)
tries+=1

2
webfinger.py
View File

@ -240,7 +240,7 @@ def webfingerLookup(path: str,baseDir: str,port: int,debug: bool) -> {}:
wfJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception webfingerLookup - '+e)
print('WARN: commentjson exception webfingerLookup - '+str(e))
time.sleep(1)
tries+=1
return wfJson

22
webinterface.py
View File

@ -158,7 +158,7 @@ def htmlSearchEmoji(translate: {},baseDir: str,searchStr: str) -> str:
loadedEmoji=True
break
except Exception as e:
print('WARN: commentjson exception htmlSearchEmoji - '+e)
print('WARN: commentjson exception htmlSearchEmoji - '+str(e))
time.sleep(1)
tries+=1
if loadedEmoji:
@ -231,7 +231,7 @@ def htmlSearchSharedItems(translate: {}, \
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception htmlSearchSharedItems - '+e)
print('WARN: commentjson exception htmlSearchSharedItems - '+str(e))
time.sleep(1)
tries+=1
if not sharesJson:
@ -398,7 +398,7 @@ def htmlHashtagSearch(translate: {}, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception htmlHashtagSearch - '+e)
print('WARN: commentjson exception htmlHashtagSearch - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -450,7 +450,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception htmlSkillsSearch - '+e)
print('WARN: commentjson exception htmlSkillsSearch - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -490,7 +490,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception htmlSkillsSearch - '+e)
print('WARN: commentjson exception htmlSkillsSearch - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -576,7 +576,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str,domain: str,port: int)
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception htmlEditProfile - '+e)
print('WARN: commentjson exception htmlEditProfile - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -1626,7 +1626,7 @@ def followerApprovalActive(baseDir: str,nickname: str,domain: str) -> bool:
loadedActor=True
break
except Exception as e:
print('WARN: commentjson exception followerApprovalActive - '+e)
print('WARN: commentjson exception followerApprovalActive - '+str(e))
time.sleep(1)
tries+=1
if loadedActor:
@ -2376,7 +2376,7 @@ def htmlIndividualPost(translate: {}, \
loadedPost=True
break
except Exception as e:
print('WARN: commentjson exception htmlIndividualPost - '+e)
print('WARN: commentjson exception htmlIndividualPost - '+str(e))
time.sleep(1)
tries+=1
if loadedPost:
@ -2452,7 +2452,7 @@ def htmlRemoveSharedItem(translate: {},baseDir: str,actor: str,shareName: str) -
sharesJson=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception htmlRemoveSharedItem - '+e)
print('WARN: commentjson exception htmlRemoveSharedItem - '+str(e))
time.sleep(1)
tries+=1
@ -2519,7 +2519,7 @@ def htmlDeletePost(translate,pageNumber: int, \
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception htmlDeletePost - '+e)
print('WARN: commentjson exception htmlDeletePost - '+str(e))
time.sleep(1)
tries+=1
if not postJsonObject:
@ -2834,7 +2834,7 @@ def getCalendarEvents(baseDir: str,nickname: str,domain: str,year: int,monthNumb
postJsonObject=commentjson.load(fp)
break
except Exception as e:
print('WARN: commentjson exception getCalendarEvents - '+e)
print('WARN: commentjson exception getCalendarEvents - '+str(e))
time.sleep(1)
tries+=1
if postJsonObject: