From e43906b44310e02148362345b6f3aa8842f6aa17 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Fri, 9 Feb 2018 12:35:02 +0000 Subject: [PATCH] output-openenergi: properly AND delta/absolute change conditions Fixes GATE-1002 --- output-openenergi/files/usr/bin/output-openenergi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/output-openenergi/files/usr/bin/output-openenergi b/output-openenergi/files/usr/bin/output-openenergi index 625d400..48f2940 100755 --- a/output-openenergi/files/usr/bin/output-openenergi +++ b/output-openenergi/files/usr/bin/output-openenergi @@ -58,8 +58,9 @@ function CACHE_ENTRY:changed() if not old then return true end local change = (new - old)/math.abs(old) --print("Considering old/new as change:", old, new, change) - if math.abs(change) >= self.opts.delta_percent then return true end - if math.abs(old-new) >= self.opts.delta_absolute then return true end + local delta = math.abs(change) >= self.opts.delta_percent + local absol = math.abs(old-new) >= self.opts.delta_absolute + if delta and absol then return true end return false end