From ed27225d10a998d570dbb3c8a8b8bcf23d45d851 Mon Sep 17 00:00:00 2001 From: TLSM Date: Thu, 13 Oct 2022 00:47:37 -0400 Subject: [PATCH] Disable Cloudflare API call timing out admin_home. --- files/routes/admin.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index f7671134ba..d3403894c6 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -425,10 +425,14 @@ def reported_comments(v): def admin_home(v): under_attack = False - if v.admin_level >= PERMS['SITE_SETTINGS_UNDER_ATTACK']: - if CF_ZONE == 'blahblahblah': response = 'high' - else: response = requests.get(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/settings/security_level', headers=CF_HEADERS, timeout=5).json()['result']['value'] - under_attack = response == 'under_attack' + ### TODO: This is timing out in gevent, something to do with _SSLErrorReadTimeout. + ### For some reason it manages to take down all the workers in the process. + ### Major service disruptions. Non-essential, so will resolve later. [2022-10-13] + ### TODO: Make more robust to API outages/timeouts. And move to a helper. + #if v.admin_level >= PERMS['SITE_SETTINGS_UNDER_ATTACK']: + # if CF_ZONE == 'blahblahblah': response = 'high' + # else: response = requests.get(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/settings/security_level', headers=CF_HEADERS, timeout=5).json()['result']['value'] + # under_attack = response == 'under_attack' gitref = admin_git_head()