Merge branch 'release/0.12.3'

leo-project · Aug 8, 2016 · 3955cf9 · 3955cf9
2 parents b4b174e + 5ce0178
commit 3955cf9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/rebar.config b/rebar.config
@@ -20,16 +20,15 @@
 %% under the License.
 %%
 %%======================================================================
-{require_otp_vsn, "R16B*|17|18"}.
+{require_otp_vsn, "R16B*|17|18|19"}.
 
 {deps, [
-        {leo_commons, "1.*", {git, "https://github.com/leo-project/leo_commons.git", {tag, "1.1.6"}}},
+        {leo_commons, "1.*", {git, "https://github.com/leo-project/leo_commons.git", {tag, "1.1.7"}}},
         {elarm, ".*", {git, "https://github.com/leo-project/elarm.git", "d9e8a6f35c408c0c4dea8a15ddcf61f54cb8a826"}}
        ]}.
 
 {erl_opts, [{d, 'NOTEST'},
             warn_obsolete_guard,
-            warnings_as_errors,
             warn_shadow_vars
            ]}.
 {xref_checks, [undefined_function_calls]}.

diff --git a/src/leo_watchdog.app.src b/src/leo_watchdog.app.src
@@ -23,7 +23,7 @@
 {application, leo_watchdog,
  [
   {description, "leo_watchdog keep monitoring applications"},
-  {vsn, "0.12.2"},
+  {vsn, "0.12.3"},
   {mod, {leo_watchdog_app, []}},
   {registered, []},
   {applications, [

diff --git a/src/leo_watchdog_cpu.erl b/src/leo_watchdog_cpu.erl
@@ -143,10 +143,17 @@ handle_call(Id, #state{threshold_load_avg = ThresholdLoadAvg,
                        raised_error_times = RaisedErrorTimes,
                        cur_error_times    = CurErrorTimes} = State) ->
     try
-        AVG_1 = erlang:round(cpu_sup:avg1() / 256 * 100),
+        AVG_1 = case catch cpu_sup:avg1() of
+                    {'EXIT',_} ->
+                        0.0;
+                    OrgAvg1 ->
+                        erlang:round(OrgAvg1 / 256 * 100)
+                end,
         CPU_Util = case os:type() of
                        {unix, linux} ->
-                           case cpu_sup:util([per_cpu]) of
+                           case catch cpu_sup:util([per_cpu]) of
+                               {'EXIT',_} ->
+                                   0;
                                [] ->
                                    0;
                                Ret_CPUUtil ->