Permalink
Browse files

Merge branch 'test' into dev

  • Loading branch information...
2 parents 868c2ec + c0865b1 commit 367bd97dd317e9a034703cacb95b70252aa8cb2d @Licenser Licenser committed Apr 20, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 plugins/zone_cpu/zone_cpu.erl
  2. +1 −1 plugins/zone_memstat/zone_memstat.erl
  3. +1 −1 plugins/zone_net/zone_net.erl
@@ -14,7 +14,7 @@ zone_cpu({KStat, Acc}) ->
K =:= "effective" orelse
K =:= "maxusage" orelse
K =:= "bursting_sec"
- ] || Vs <- Data1],
+ ] || Vs <- Data1, is_list(Vs)],
{KStat, build_obj(Data2, Acc)}.
build_obj([Keys | R], Data) ->
@@ -10,7 +10,7 @@ zone_memstat({KStat, Acc}) ->
K =:= "rss" orelse
K =:= "physcap" orelse
K =:= "swap" orelse
- K =:= "swapcap"] || Vs <- Data1],
+ K =:= "swapcap"] || Vs <- Data1, is_list(Vs)],
{KStat, build_obj(Data2, Acc)}.
build_obj([Keys | R], Data) ->
@@ -13,7 +13,7 @@ zone_net({KStat, Acc}) ->
K =:= "oerrors" orelse
K =:= "ipackets64" orelse
K =:= "rbytes64" orelse
- K =:= "ierrors"] || Vs <- Data1],
+ K =:= "ierrors"] || Vs <- Data1, is_list(Vs)],
{KStat, build_obj(Data2, Acc)}.
fix_name(Name) ->

0 comments on commit 367bd97

Please sign in to comment.