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

Session timeout

merge-requests/30/head
Bob Mottram 2021-03-02 18:02:29 +00:00
parent 46657e60f3
commit d3266f236d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epicyon.py
View File

@ -1940,9 +1940,7 @@ if args.speaker:
session = createSession(proxyType) session = createSession(proxyType)
speakerJson = \ speakerJson = \
getSpeakerFromServer(baseDir, session, nickname, args.password, getSpeakerFromServer(baseDir, session, nickname, args.password,
domain, port, domain, port, httpPrefix, True, __version__)
httpPrefix,
True, __version__)
if speakerJson: if speakerJson:
if speakerJson['say'] != prevSay: if speakerJson['say'] != prevSay:
if speakerJson.get('name'): if speakerJson.get('name'):

5
session.py
View File

@ -86,7 +86,7 @@ def urlExists(session, url: str, timeoutSec=3,
def getJson(session, url: str, headers: {}, params: {}, def getJson(session, url: str, headers: {}, params: {},
version='1.2.0', httpPrefix='https', version='1.2.0', httpPrefix='https',
domain='testdomain') -> {}: domain='testdomain', timeoutSec=20) -> {}:
if not isinstance(url, str): if not isinstance(url, str):
print('url: ' + str(url)) print('url: ' + str(url))
print('ERROR: getJson failed, url should be a string') print('ERROR: getJson failed, url should be a string')
@ -105,7 +105,8 @@ def getJson(session, url: str, headers: {}, params: {},
print('WARN: getJson failed, no session specified for getJson') print('WARN: getJson failed, no session specified for getJson')
return None return None
try: try:
result = session.get(url, headers=sessionHeaders, params=sessionParams) result = session.get(url, headers=sessionHeaders,
params=sessionParams, timeout=timeoutSec)
return result.json() return result.json()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
print('ERROR: getJson failed\nurl: ' + str(url) + ' ' + print('ERROR: getJson failed\nurl: ' + str(url) + ' ' +