File exometer_core-1.5.0-git.patch of Package exometer_core

Overview Repositories Revisions Requests Users Attributes Meta

File exometer_core-1.5.0-git.patch of Package exometer_core (Revision bd84f4ddcaf378c24845ec7fc96eae85)

Currently displaying revision bd84f4ddcaf378c24845ec7fc96eae85 , Show latest

diff --git a/.travis.yml b/.travis.yml
index 381de56..c6f2cb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ sudo: false
 language: erlang
 script: "make ci"
 otp_release:
+    - 20.3
+    - 20.2
+    - 20.1
     - 20.0
     - 19.3
     - 19.2
@@ -12,10 +15,4 @@ otp_release:
     - 18.2
     - 18.1
     - 18.0
-    - 17.5
-    - 17.4
-    - 17.3
-    - 17.1
-    - 17.0
-    - R16B03-1
 after_failure: "echo 'logs/raw.log\n'; cat logs/raw.log; for f in `find logs/ct_run*/log*/ -type f`; do echo \"\n$f\n\" ; cat $f; done"
diff --git a/rebar.config b/rebar.config
index e8c0bcb..5b6591a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -9,10 +9,10 @@
 
 {deps,
  [
-  {parse_trans, ".*", {git, "git://github.com/uwiger/parse_trans.git", {tag, "3.0.0"}}},
+  {parse_trans, ".*", {git, "git://github.com/uwiger/parse_trans.git", {tag, "3.2.0"}}},
   {folsom, ".*", {git, "git://github.com/folsom-project/folsom", {tag, "0.8.5"}}},
   {hut, ".*", {git, "git://github.com/tolbrino/hut.git", {tag, "v1.1.1"}}},
-  {setup, ".*", {git, "git://github.com/uwiger/setup.git", {tag, "1.8.2"}}}
+  {setup, ".*", {git, "git://github.com/uwiger/setup.git", {tag, "2.0.2"}}}
  ]}.
 
 {profiles,
diff --git a/src/exometer.erl b/src/exometer.erl
index 6bc15fe..36572bc 100644
--- a/src/exometer.erl
+++ b/src/exometer.erl
@@ -400,7 +400,8 @@ get_cached_value_(#exometer_entry{name = Name,
             [ exometer_cache:write(Name, DataPoint1, Value1, CacheTTL)
               || { DataPoint1, Value1 } <- Result],
             All = Result ++ Cached,
-            [{_,_} = lists:keyfind(DP, 1, All) || DP <- DataPoints]
+            [{_,_} = lists:keyfind(DP, 1, All) || DP <- DataPoints,
+                                                  lists:keymember(DP,1,All)]
     end.
 
 
diff --git a/src/exometer_report.erl b/src/exometer_report.erl
index 6316d90..abb99bd 100644
--- a/src/exometer_report.erl
+++ b/src/exometer_report.erl
@@ -1299,7 +1299,7 @@ adjust_interval(Time, T0) ->
             %% Most likely due to clock adjustment
             {Time, T1};
         D ->
-            {D, T0}
+            {Time-D, T0}
     end.
 
 tdiff(T1, T0) ->

Places

File exometer_core-1.5.0-git.patch of Package exometer_core (Revision bd84f4ddcaf378c24845ec7fc96eae85)

Places