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

Federation tokens in memory

merge-requests/30/head
Bob Mottram 2021-07-26 12:19:49 +01:00
parent 2cfd87d802
commit 43d7071ab8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -15072,15 +15072,7 @@ def runDaemon(sharedItemsFederatedDomains: [],
httpd.httpPrefix = httpPrefix httpd.httpPrefix = httpPrefix
httpd.debug = debug httpd.debug = debug
httpd.federationList = fedList.copy() httpd.federationList = fedList.copy()
if not sharedItemsFederatedDomains:
sharedItemsTokensFilename = \
baseDir + '/accounts/sharedItemsFederationTokens.json'
if os.path.isfile(sharedItemsTokensFilename):
sharedItemsFederatedDomains = loadJson(sharedItemsTokensFilename)
httpd.sharedItemsFederatedDomains = sharedItemsFederatedDomains.copy() httpd.sharedItemsFederatedDomains = sharedItemsFederatedDomains.copy()
if httpd.sharedItemsFederatedDomains:
if domain not in httpd.sharedItemsFederatedDomains:
httpd.sharedItemsFederatedDomains.append(domain)
httpd.baseDir = baseDir httpd.baseDir = baseDir
httpd.instanceId = instanceId httpd.instanceId = instanceId
httpd.personCache = {} httpd.personCache = {}
@ -15220,8 +15212,9 @@ def runDaemon(sharedItemsFederatedDomains: [],
httpd.fontsCache = {} httpd.fontsCache = {}
# create tokens used for shared item federation # create tokens used for shared item federation
generateSharedItemFederationTokens(httpd.sharedItemsFederatedDomains, httpd.sharedItemFederationTokens = \
baseDir) generateSharedItemFederationTokens(httpd.sharedItemsFederatedDomains,
baseDir)
# load peertube instances from file into a list # load peertube instances from file into a list
httpd.peertubeInstances = [] httpd.peertubeInstances = []