marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small SDK changes for proxy and verbosity

Browse Source
This commit is contained in:
Frikky
2024-01-16 15:18:47 +01:00
parent 9b24a45627
commit 8a48dee950
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/app_base.py
+17 -6
View File
@@ -551,12 +551,12 @@ class AppBase:
# Proxyerrror # Proxyerrror
except requests.exceptions.ProxyError as e: except requests.exceptions.ProxyError as e:
self.logger.info(f"[ERROR] Proxy error: {e}") self.logger.info(f"[ERROR] Proxy error for url {url}: {e}")
self.proxy_config = {} self.proxy_config = {}
continue continue
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
self.logger.info(f"[DEBUG] Request problem: {e}") self.logger.info(f"[DEBUG] Request problem for url {url}: {e}"
time.sleep(sleeptime) time.sleep(sleeptime)
# Check if we have a read timeout. If we do, exit as we most likely sent the result without getting a good result # Check if we have a read timeout. If we do, exit as we most likely sent the result without getting a good result
@@ -1576,9 +1576,10 @@ class AppBase:
"execution_id": self.current_execution_id "execution_id": self.current_execution_id
} }
self.logger.info("[ERROR] Before FULLEXEC stream result") resultsurl = "%s/api/v1/streams/results" % (self.base_url)
self.logger.info("[ERROR] Before FULLEXEC stream result url '%s'" % (resultsurl))
ret = requests.post( ret = requests.post(
"%s/api/v1/streams/results" % (self.base_url), resultsurl,
headers=headers, headers=headers,
json=tmpdata, json=tmpdata,
verify=False, verify=False,
@@ -1600,7 +1601,7 @@ class AppBase:
continue continue
else: else:
self.logger.info("[ERROR] Error in app with status code %d for results (2). Crashing because results can't be handled" % ret.status_code) self.logger.info("[ERROR] (fails: %d) Error in app with status code %d for results (2). Crashing because results can't be handled. Details: %s" % (i+1, ret.status_code, ret.text))
rettext = ret.text rettext = ret.text
failed = True failed = True
@@ -1621,11 +1622,21 @@ class AppBase:
self.logger.info("[ERROR] FullExec Connectionerror: %s" % e) self.logger.info("[ERROR] FullExec Connectionerror: %s" % e)
self.action_result["result"] = json.dumps({ self.action_result["result"] = json.dumps({
"success": False, "success": False,
"reason": f"Connection error during startup: {e}" "reason": f"Connection error during startup (connection error): {e}"
}) })
self.send_result(self.action_result, headers, stream_path) self.send_result(self.action_result, headers, stream_path)
return return
except Exception as e:
self.logger.info("[ERROR] FullExec Exception outer: %s" % e)
self.action_result["result"] = json.dumps({
"success": False,
"reason": f"Exception during startup of app (general error): {e}"
})
self.send_result(self.action_result, headers, stream_path)
return
else: else:
self.logger.info(f"[DEBUG] Setting execution to default value with type {type(self.full_execution)}") self.logger.info(f"[DEBUG] Setting execution to default value with type {type(self.full_execution)}")
try: try: