Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-10 21:10:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update request timeout default

Browse Source
This commit is contained in:
ErikKalkoken 2020-06-25 22:32:29 +02:00
parent 55cc77140e
commit 580c8c19de
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
allianceauth/services/modules/discord/discord_client/app_settings.py
View File

@ -6,9 +6,14 @@ DISCORD_API_BASE_URL = clean_setting(
'DISCORD_API_BASE_URL', 'https://discordapp.com/api/' 'DISCORD_API_BASE_URL', 'https://discordapp.com/api/'
) )
# Low level timeout for requests to the Discord API in ms # Low level connecttimeout for requests to the Discord API in seconds
DISCORD_API_TIMEOUT = clean_setting( DISCORD_API_TIMEOUT_CONNECT = clean_setting(
'DISCORD_API_TIMEOUT', 5000 'DISCORD_API_TIMEOUT', 5
)
# Low level read timeout for requests to the Discord API in seconds
DISCORD_API_TIMEOUT_READ = clean_setting(
'DISCORD_API_TIMEOUT', 30
) )
# Base authorization URL for Discord Oauth # Base authorization URL for Discord Oauth

5
allianceauth/services/modules/discord/discord_client/client.py
View File

@ -15,7 +15,8 @@ from allianceauth import __title__ as AUTH_TITLE, __url__, __version__
from .. import __title__ from .. import __title__
from .app_settings import ( from .app_settings import (
DISCORD_API_BASE_URL, DISCORD_API_BASE_URL,
DISCORD_API_TIMEOUT, DISCORD_API_TIMEOUT_CONNECT,
DISCORD_API_TIMEOUT_READ,
DISCORD_DISABLE_ROLE_CREATION, DISCORD_DISABLE_ROLE_CREATION,
DISCORD_GUILD_NAME_CACHE_MAX_AGE, DISCORD_GUILD_NAME_CACHE_MAX_AGE,
DISCORD_OAUTH_BASE_URL, DISCORD_OAUTH_BASE_URL,
@ -540,7 +541,7 @@ class DiscordClient:
args = { args = {
'url': url, 'url': url,
'headers': headers, 'headers': headers,
'timeout': DISCORD_API_TIMEOUT / 1000 'timeout': (DISCORD_API_TIMEOUT_CONNECT, DISCORD_API_TIMEOUT_READ)
} }
if data: if data:
args['json'] = data args['json'] = data