slowly making it more better

full_example
Mark Cotton 2023-07-14 10:48:14 -05:00
parent 7c66c9eaf2
commit 155a0f7f14
4 changed files with 50 additions and 21 deletions

View File

@ -561,7 +561,8 @@ class Camera(Device):
"Accept": "application/json" "Accept": "application/json"
} }
response = requests.get(url, headers=headers) try:
response = requests.get(url, headers=headers, timeout=(3, 5))
response_json = response.json() response_json = response.json()
logging.debug(f"{response.status_code} returned from {url} with {headers} and {response.text}") logging.debug(f"{response.status_code} returned from {url} with {headers} and {response.text}")
@ -585,6 +586,22 @@ class Camera(Device):
else: else:
success = False success = False
except requests.exceptions.Timeout:
logging.warn(f"timeout expired for {self.id} get_llist_of_events()")
return {
"success": False,
"response_http_status": 0,
"data": None
}
except requests.exceptions.RequestException as e:
logging.warn(e)
return {
"success": False,
"response_http_status": 0,
"data": None
}
return { return {
"success": success, "success": success,

2
app.py
View File

@ -122,7 +122,7 @@ def camera_live_preivew(esn=None):
if res: if res:
return send_file(BytesIO(res.content), mimetype='image/jpeg') return send_file(BytesIO(res.content), mimetype='image/jpeg')
else: else:
return send_file('static/placeholder1.png') return send_file('static/placeholder.png')
@app.route('/camera/<esn>') @app.route('/camera/<esn>')

View File

@ -1,6 +1,6 @@
<div class="col-md-3" id="camera_list_offline"> <div class="col-md-3" id="camera_list_items">
<h3>Online</h3> <h3>Online</h3>
<ul> <ul>
{% for camera in template_values['cameras'] %} {% for camera in template_values['cameras'] %}

View File

@ -1,6 +1,18 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block style %} {% block style %}
<style>
#camera_list_items {
max-height: 500px;
overflow: auto;
}
#events_list {
max-height: 500px;
overflow: auto;
}
</style>
{% endblock %} {% endblock %}
{% block current_user %} {% block current_user %}