proper error handling

Midnight95 · Oct 3, 2023 · e51c4b5 · e51c4b5
1 parent ae7fec7
commit e51c4b5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/page_analyzer/app.py b/page_analyzer/app.py
@@ -104,7 +104,12 @@ def check_url(id):
             render_url(id=id, table='urls', col='id')[0]['name'],
             timeout=5
         )
-    except requests.exceptions.RequestException:
+    except (
+            requests.Timeout,
+            requests.ConnectionError,
+            requests.HTTPError,
+            requests.RequestException
+    ):
         flash('Произошла ошибка при проверке', 'error')
         return redirect(url_for('url_info', id=id))
 

diff --git a/page_analyzer/parsers.py b/page_analyzer/parsers.py
@@ -14,4 +14,3 @@ def get_last_status_codes(checks):
             }
 
     return result
-
diff --git a/page_analyzer/templates/urls.html b/page_analyzer/templates/urls.html
@@ -29,13 +29,17 @@ <h1>Сайты</h1>
                     </a>
                   </td>
                   <td>
-                      {% if site.created_at %}
-                        {{ site.created_at }}
+                      {% if checks %}
+                          {% if checks[site.id] %}
+                            {{ checks[site.id].created_at }}
+                          {% endif %}
                       {% endif %}
                   </td>
                   <td>
-                      {% if site.response %}
-                        {{ site.response }}
+                      {% if checks %}
+                          {% if checks[site.id] %}
+                            {{ checks[site.id].status_code }}
+                          {% endif %}
                       {% endif %}
                   </td>
                 </tr>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@ def get_last_status_codes(checks):
		}

		return result