diff --git a/allianceauth/services/modules/discord/discord_client/app_settings.py b/allianceauth/services/modules/discord/discord_client/app_settings.py index 668d6cf4..5f8b21ce 100644 --- a/allianceauth/services/modules/discord/discord_client/app_settings.py +++ b/allianceauth/services/modules/discord/discord_client/app_settings.py @@ -6,9 +6,14 @@ DISCORD_API_BASE_URL = clean_setting( 'DISCORD_API_BASE_URL', 'https://discordapp.com/api/' ) -# Low level timeout for requests to the Discord API in ms -DISCORD_API_TIMEOUT = clean_setting( - 'DISCORD_API_TIMEOUT', 5000 +# Low level connecttimeout for requests to the Discord API in seconds +DISCORD_API_TIMEOUT_CONNECT = clean_setting( + '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 diff --git a/allianceauth/services/modules/discord/discord_client/client.py b/allianceauth/services/modules/discord/discord_client/client.py index 605473d3..aff50c16 100644 --- a/allianceauth/services/modules/discord/discord_client/client.py +++ b/allianceauth/services/modules/discord/discord_client/client.py @@ -15,7 +15,8 @@ from allianceauth import __title__ as AUTH_TITLE, __url__, __version__ from .. import __title__ from .app_settings import ( DISCORD_API_BASE_URL, - DISCORD_API_TIMEOUT, + DISCORD_API_TIMEOUT_CONNECT, + DISCORD_API_TIMEOUT_READ, DISCORD_DISABLE_ROLE_CREATION, DISCORD_GUILD_NAME_CACHE_MAX_AGE, DISCORD_OAUTH_BASE_URL, @@ -540,7 +541,7 @@ class DiscordClient: args = { 'url': url, 'headers': headers, - 'timeout': DISCORD_API_TIMEOUT / 1000 + 'timeout': (DISCORD_API_TIMEOUT_CONNECT, DISCORD_API_TIMEOUT_READ) } if data: args['json'] = data