harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

More efficient log updates.

Browse Source
This commit is contained in:
Pēteris Caune 2018-08-19 12:52:51 +03:00
parent a883fe38aa
commit ecba1eb40b
No known key found for this signature in database
GPG Key ID: E28D7679E9A9EDE2
3 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hc/front/views.py
View File

@ -386,14 +386,18 @@ def status_single(request, code):
events = _get_events(check, 20) events = _get_events(check, 20)
updated = None updated = None
if len(events): if len(events):
updated = events[0].created.isoformat() updated = events[0].created.replace(tzinfo=None).isoformat()
return JsonResponse({ doc = {
"status": status, "status": status,
"status_text": STATUS_TEXT_TMPL.render({"check": check}), "status_text": STATUS_TEXT_TMPL.render({"check": check}),
"events": EVENTS_TMPL.render({"check": check, "events": events}),
"updated": updated "updated": updated
}) }
if updated != request.GET.get("u"):
doc["events"] = EVENTS_TMPL.render({"check": check, "events": events})
return JsonResponse(doc)
@login_required @login_required

6
static/js/details.js
View File

@ -30,7 +30,7 @@ $(function () {
var lastUpdated = ""; var lastUpdated = "";
adaptiveSetInterval(function() { adaptiveSetInterval(function() {
$.ajax({ $.ajax({
url: statusUrl, url: statusUrl + (lastUpdated ? "?u=" + lastUpdated : ""),
dataType: "json", dataType: "json",
timeout: 2000, timeout: 2000,
success: function(data) { success: function(data) {
@ -40,7 +40,7 @@ $(function () {
$("#log-status-text").text(data.status_text); $("#log-status-text").text(data.status_text);
} }
if (data.updated != lastUpdated) { if (data.events) {
lastUpdated = data.updated; lastUpdated = data.updated;
$("#events").html(data.events); $("#events").html(data.events);
switchDateFormat(lastFormat); switchDateFormat(lastFormat);
@ -67,7 +67,7 @@ $(function () {
prompt("Press Ctrl+C to select:", text) prompt("Press Ctrl+C to select:", text)
}); });
$("#log tr.ok").on("click", function() { $("#events").on("click", "tr.ok", function() {
$("#ping-details-body").text("Updating..."); $("#ping-details-body").text("Updating...");
$('#ping-details-modal').modal("show"); $('#ping-details-modal').modal("show");

2
templates/front/details_events.html
View File

@ -16,7 +16,6 @@
</div> </div>
</h2> </h2>
<div id="log-container">
<table class="table" id="log"> <table class="table" id="log">
{% for event in events %} {% for event in events %}
{% if event.n %} {% if event.n %}
@ -103,7 +102,6 @@
<a href="{% url 'hc-log' check.code %}">Show More&hellip;</a> <a href="{% url 'hc-log' check.code %}">Show More&hellip;</a>
</p> </p>
{% endif %} {% endif %}
</div>
{% else %} {% else %}
<h2>Log</h2> <h2>Log</h2>
<div class="alert alert-info">This check has not received any pings yet.</div> <div class="alert alert-info">This check has not received any pings yet.</div>