ereuse/workbench-script
9
0
Fork 0
Code Issues 3 Pull requests 1 Packages Projects Releases Wiki Activity

163-10-158-small-fixes #12

Open
sergiogimenez wants to merge 3 commits from 163-10-158-small-fixes into main
pull from: 163-10-158-small-fixes
merge into: ereuse:main
Conversation 0 Commits 3 Files changed 4 +41 -28
1 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ef17701a68 - Show all commits

69
workbench-script.py
View file

@ -17,6 +17,7 @@ import locale
import logging import logging
from datetime import datetime from datetime import datetime
import time
SNAPSHOT_BASE = { SNAPSHOT_BASE = {
@ -31,7 +32,6 @@ SNAPSHOT_BASE = {
} }
## Utility Functions ## ## Utility Functions ##
def logs(f): def logs(f):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
@ -364,7 +364,7 @@ def generate_qr_code(url, disable_qr):
# TODO sanitize url, if url is like this, it fails # TODO sanitize url, if url is like this, it fails
# url = 'http://127.0.0.1:8000/api/snapshot/' # url = 'http://127.0.0.1:8000/api/snapshot/'
def send_snapshot_to_devicehub(snapshot, token, url, ev_uuid, legacy, disable_qr): def send_snapshot_to_devicehub(snapshot, token, url, ev_uuid, legacy, disable_qr, max_retries=5):
url_components = urllib.parse.urlparse(url) url_components = urllib.parse.urlparse(url)
ev_path = f"evidence/{ev_uuid}" ev_path = f"evidence/{ev_uuid}"
components = (url_components.scheme, url_components.netloc, ev_path, '', '', '') components = (url_components.scheme, url_components.netloc, ev_path, '', '', '')
@ -374,35 +374,48 @@ def send_snapshot_to_devicehub(snapshot, token, url, ev_uuid, legacy, disable_qr
"Authorization": f"Bearer {token}", "Authorization": f"Bearer {token}",
"Content-Type": "application/json" "Content-Type": "application/json"
} }
try:
data = snapshot.encode('utf-8')
request = urllib.request.Request(url, data=data, headers=headers)
with urllib.request.urlopen(request) as response:
status_code = response.getcode()
response_text = response.read().decode('utf-8')
if 200 <= status_code < 300: retries = 0
logger.info(_("Snapshot successfully sent to '%s'"), url) while retries < max_retries:
if legacy: try:
try: data = snapshot.encode('utf-8')
response = json.loads(response_text) request = urllib.request.Request(url, data=data, headers=headers)
public_url = response.get('public_url') with urllib.request.urlopen(request) as response:
dhid = response.get('dhid') status_code = response.getcode()
if public_url: response_text = response.read().decode('utf-8')
generate_qr_code(public_url, disable_qr)
print("url: {}".format(public_url)) if 200 <= status_code < 300:
if dhid: logger.info(_("Snapshot successfully sent to '%s'"), url)
print("dhid: {}".format(dhid)) if legacy:
except Exception: try:
logger.error(response_text) response = json.loads(response_text)
public_url = response.get('public_url')
dhid = response.get('dhid')
if public_url:
generate_qr_code(public_url, disable_qr)
print("url: {}".format(public_url))
if dhid:
print("dhid: {}".format(dhid))
except Exception:
logger.error(response_text)
else:
generate_qr_code(ev_url, disable_qr)
print("url: {}".format(ev_url))
return
else: else:
generate_qr_code(ev_url, disable_qr) logger.error(
print("url: {}".format(ev_url)) _("Snapshot %s not remotely sent to URL '%s'. Server responded with error:\n %s"), ev_uuid, url, response_text)
else: except Exception as e:
logger.error(_("Snapshot %s not remotely sent to URL '%s'. Server responded with error:\n %s"), ev_uuid, url, response_text) logger.error(
_("Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), url, e)
except Exception as e: retries += 1
logger.error(_("Snapshot not remotely sent to URL '%s'. Do you have internet? Is your server up & running? Is the url token authorized?\n %s"), url, e) if retries < max_retries:
logger.info(_("Retrying... (%d/%d)"), retries, max_retries)
time.sleep(5) # TODO arbitrary number of seconds.
logger.error(
_("Failed to send snapshot to URL '%s' after %d attempts"), url, max_retries)
def load_config(config_file="settings.ini"): def load_config(config_file="settings.ini"):