Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/webmon_app/reporting/dasmon/view_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,8 @@ def get_signals(instrument_id):
try:
monitored = MonitoredVariable.objects.filter(instrument=instrument_id)
for item in monitored:
if item.pv_name is None:
continue
try:
latests = PVCache.objects.filter(instrument=instrument_id, name=item.pv_name)
if len(latests) == 0:
Expand All @@ -987,10 +989,11 @@ def get_signals(instrument_id):
data = pvmon_view_util.get_live_variables(request=None, instrument_id=instrument_id, key_id=item.pv_name)
data_list = []
try:
for point in data[0][1]:
data_list.append("%g:%g" % (point[0], point[1]))
if data is not None and len(data) > 0 and len(data[0]) > 1:
for point in data[0][1]:
data_list.append("%g:%g" % (point[0], point[1]))
except: # noqa: E722
logger.exception()
logger.exception(f"Error processing data for {instrument_id} {item.pv_name}:")
sig_entry.data = ",".join(data_list)
sig_alerts.append(sig_entry)
except: # noqa: E722
Expand Down
35 changes: 35 additions & 0 deletions src/webmon_app/reporting/tests/test_dasmon/test_view_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,41 @@ def test_get_signals(self):
assert me.name == f"sig_{i}"
assert f"msg_{i}" in me.status

def test_get_signals_when_has_monitored_variable_none(self):
from reporting.dasmon.view_util import get_signals

# make instrument
inst = Instrument.objects.create(name="testinst_getsignals_no_mon_pvs")
inst.save()

# test with monitored variable with pv_name equal to None
MonitoredVariable.objects.create(
instrument=inst,
pv_name=None,
rule_name="",
)
sig_list = get_signals(inst)
assert len(sig_list) == 0

# test with monitored variables where one is None and one is valid
pvname = PVName.objects.create(name="testpv")
pvname.save()
PVStringCache.objects.create(
instrument=inst,
name=pvname,
value="test",
status=0,
timestamp=timezone.now(),
)
MonitoredVariable.objects.create(
instrument=inst,
pv_name=pvname,
rule_name="",
)
# test
sig_list = get_signals(inst)
assert len(sig_list) == 1

def test_get_instrument_status_summary(self):
from reporting.dasmon.view_util import get_instrument_status_summary

Expand Down