Merge branch 'develop'

leo-project · Jun 30, 2015 · ede5ad7 · ede5ad7
2 parents b460c06 + 6e5d90d
commit ede5ad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/src/leo_manager_formatter_json.erl b/src/leo_manager_formatter_json.erl
@@ -303,14 +303,6 @@ node_stat(?SERVER_TYPE_STORAGE, State) ->
                   {<<"wd_cpu_interval">>,                leo_misc:get_value('cpu_interval',                WatchdogProps)},
                   {<<"wd_cpu_threshold_cpu_load_avg">>,  leo_misc:get_value('cpu_threshold_cpu_load_avg',  WatchdogProps)},
                   {<<"wd_cpu_threshold_cpu_util">>,      leo_misc:get_value('cpu_threshold_cpu_util',      WatchdogProps)},
-                  {<<"wd_io_enabled">>,                  list_to_binary(
-                                                           atom_to_list(
-                                                             leo_manager_formatter_commons:exchange_value(
-                                                               ?BOOL_TO_ENABLE,
-                                                               leo_misc:get_value('io_enabled', WatchdogProps))))},
-                  {<<"wd_io_interval">>,                 leo_misc:get_value('io_interval',                 WatchdogProps)},
-                  {<<"wd_io_threshold_input_per_sec">>,  leo_misc:get_value('io_threshold_input_per_sec',  WatchdogProps)},
-                  {<<"wd_io_threshold_output_per_sec">>, leo_misc:get_value('io_threshold_output_per_sec', WatchdogProps)},
                   {<<"wd_disk_enabled">>,  list_to_binary(
                                              atom_to_list(
                                                leo_manager_formatter_commons:exchange_value(

diff --git a/src/leo_manager_formatter_text.erl b/src/leo_manager_formatter_text.erl
@@ -526,12 +526,6 @@ node_stat(?SERVER_TYPE_STORAGE, State) ->
                                 "               threshold cpu load avg | ~w\r\n",
                                 "                threshold cpu util(%) | ~w\r\n",
                                 "--------------------------------------+--------------------------------------\r\n",
-                                " [erlang-io]                          |\r\n",
-                                "                     enabled/disabled | ~w\r\n",
-                                "                    check interval(s) | ~w\r\n",
-                                "               threshold input size/s | ~w\r\n",
-                                "              threshold output size/s | ~w\r\n",
-                                "--------------------------------------+--------------------------------------\r\n",
                                 " [disk]                               |\r\n",
                                 "                     enabled/disalbed | ~w\r\n",
                                 "                    check interval(s) | ~w\r\n",
@@ -591,20 +585,14 @@ node_stat(?SERVER_TYPE_STORAGE, State) ->
                    ObjContainer_1,
                    leo_misc:get_value('log', Directories, []),
                    %% Watchdog
-                   leo_misc:get_value('rex_interval',                WatchdogProps),
-                   leo_misc:get_value('rex_threshold_mem_capacity',  WatchdogProps),
+                   leo_misc:get_value('rex_interval', WatchdogProps),
+                   leo_misc:get_value('rex_threshold_mem_capacity', WatchdogProps),
                    leo_manager_formatter_commons:exchange_value(
                      ?BOOL_TO_ENABLE,
-                     leo_misc:get_value('cpu_enabled',  WatchdogProps)),
-                   leo_misc:get_value('cpu_interval',                WatchdogProps),
-                   leo_misc:get_value('cpu_threshold_cpu_load_avg',  WatchdogProps),
-                   leo_misc:get_value('cpu_threshold_cpu_util',      WatchdogProps),
-                   leo_manager_formatter_commons:exchange_value(
-                     ?BOOL_TO_ENABLE,
-                     leo_misc:get_value('io_enabled',   WatchdogProps)),
-                   leo_misc:get_value('io_interval',                 WatchdogProps),
-                   leo_misc:get_value('io_threshold_input_per_sec',  WatchdogProps),
-                   leo_misc:get_value('io_threshold_output_per_sec', WatchdogProps),
+                     leo_misc:get_value('cpu_enabled', WatchdogProps)),
+                   leo_misc:get_value('cpu_interval',               WatchdogProps),
+                   leo_misc:get_value('cpu_threshold_cpu_load_avg', WatchdogProps),
+                   leo_misc:get_value('cpu_threshold_cpu_util',     WatchdogProps),
                    leo_manager_formatter_commons:exchange_value(
                      ?BOOL_TO_ENABLE,
                      leo_misc:get_value('disk_enabled', WatchdogProps)),