diff --git a/gracedb/reports.py b/gracedb/reports.py index b6a072f7f2684496cf37d4c819e68a17e3202053..a2639a255fdeb32badfe742f1ad145edd7876bf8 100644 --- a/gracedb/reports.py +++ b/gracedb/reports.py @@ -4,15 +4,21 @@ from django.template import RequestContext from django.shortcuts import render_to_response from django.conf import settings - +import os def histo(request): try: table = open(settings.LATENCY_REPORT_WEB_PAGE_FILE_PATH, "r").read() except IOError: table = "No Data Available" + if os.access(settings.REPORT_IFAR_IMAGE, os.R_OK): + ifar = settings.REPORT_IFAR_URL + else: + ifar = None return render_to_response( 'gracedb/histogram.html', - {'table': table}, + {'table': table, + 'ifar' : ifar, + }, context_instance=RequestContext(request)) diff --git a/settings.py b/settings.py index f6c935299d2ed0310c1e7f08cb80c3799a5b46e2..ae694d88f21c665f19433ae927f6d145d281fc88 100644 --- a/settings.py +++ b/settings.py @@ -75,6 +75,10 @@ LATENCY_REPORT_DEST_DIR = "/home/gracedb/data/latency" LATENCY_MAXIMUM_CHARTED = 1800 LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc" +REPORT_CBC_IFAR_QUERY = "LowMass ER1 hasfar" +REPORT_IFAR_IMAGE = LATENCY_REPORT_DEST_DIR + "/ifar.png" +REPORT_IFAR_URL = "ifar.png" + # RSS Feed Defaults FEED_MAX_RESULTS = 50 diff --git a/settings_dev.py b/settings_dev.py index ced01809496969b8ce6f081efa46014373afb398..f63d0a3e1d3f6a7060bb92b8155ae533700b1525 100644 --- a/settings_dev.py +++ b/settings_dev.py @@ -60,10 +60,14 @@ GRACEDB_DATA_DIR = "/mnt/gracedb-web/data" #GRACEDB_DATA_DIR = "/mnt/gracedb-web-temp/data" # Latency histograms. Where they go and max latency to bin. -LATENCY_REPORT_DEST_DIR = "/home/bmoe/django/data/latency" +LATENCY_REPORT_DEST_DIR = "/home/bmoe/data/latency" LATENCY_MAXIMUM_CHARTED = 1800 LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc" +REPORT_CBC_IFAR_QUERY = "LowMass ER1 hasfar" +REPORT_IFAR_IMAGE = LATENCY_REPORT_DEST_DIR + "/ifar.png" +REPORT_IFAR_URL = "ifar.png" + # RSS Feed Defaults FEED_MAX_RESULTS = 50 diff --git a/templates/gracedb/histogram.html b/templates/gracedb/histogram.html index 5419b8f4f122e68ba6a62d555b3ba7f0b01f4a9f..f2fabdb25f79024e03d16c3fddf5fb63afbbf8b1 100644 --- a/templates/gracedb/histogram.html +++ b/templates/gracedb/histogram.html @@ -1,11 +1,21 @@ {% extends "base.html" %} -{% block title %}Reporting Latency{% endblock %} -{% block heading %}Reporting Latency{% endblock %} +{% block title %}Reports{% endblock %} +{% block heading %}Reports{% endblock %} {% block pageid %}reports{% endblock %} {% block content %} +<h3>Latency</h3> {{ table|safe }} +<br/> + +<h3>CBC IFAR</h3> +{% if ifar %} + <img src="{{ ifar }}">hai +{% else %} + No IFAR table. +{% endif %} + {% endblock %}