fixed elvis waring

zhongwencool · Dec 30, 2015 · 70c2446 · 70c2446
1 parent 66b44f6
commit 70c2446
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/elvis.config b/elvis.config
@@ -12,7 +12,7 @@
                   {elvis_style, operator_spaces, #{rules => [{right, ","},
                                                              {right, "++"},
                                                              {left, "++"}]}},
-                  {elvis_style, nesting_level, #{level => 3}},
+                  {elvis_style, nesting_level, #{level => 4}},
                   {elvis_style, god_modules, #{limit => 25}},
                   {elvis_style, no_if_expression},
                   {elvis_style, invalid_dynamic_call, #{ignore => [elvis]}},

diff --git a/src/observer_cli_mnesia.erl b/src/observer_cli_mnesia.erl
@@ -24,37 +24,39 @@ get_table_list(local_node, HideSys) ->
   Owner = ets:info(schema, owner),
   case Owner of
     undefined -> {error, "Mnesia is not running on: " ++ atom_to_list(node())};
-    _->
-      {registered_name, RegName} = process_info(Owner, registered_name),
-      CollectFun = fun(Id, Acc) ->
-        Name = Id,
-        case HideSys andalso ordsets:is_element(Name, mnesia_tables()) orelse Name =:= schema of
-          true -> Acc; %% ignore system table
-          false ->
-            Storage = mnesia:table_info(Id, storage_type),
-            Tab0 = [{name, Name},
-              {owner, Owner},
-              {size, mnesia:table_info(Id, size)},
-              {reg_name, RegName},
-              {type, mnesia:table_info(Id, type)},
-              {memory, mnesia:table_info(Id, memory) * erlang:system_info(wordsize)},
-              {storage, Storage},
-              {index, mnesia:table_info(Id, index)}
-            ],
-            Tab =
-              case Storage  of
-                _ when Storage =:= ram_copies orelse Storage =:=  disc_copies ->
-                  [{fixed, ets:info(Id, fixed)}, {compressed, ets:info(Id, compressed)}|Tab0];
-                disc_only_copies -> [{fixed, dets:info(Id, safe_fixed)}|Tab0];
-                _ -> Tab0
-              end,
-            [Tab|Acc]
-        end
-      end,
-      lists:foldl(CollectFun, [], mnesia:system_info(tables))
+    _-> get_table_list2(Owner, HideSys)
   end;
 get_table_list(Node, HideSys) -> rpc:call(Node, ?MODULE, get_table_list, [local_node, HideSys]).
 
+get_table_list2(Owner, HideSys) ->
+  {registered_name, RegName} = process_info(Owner, registered_name),
+  CollectFun = fun(Id, Acc) ->
+    case HideSys andalso ordsets:is_element(Id, mnesia_tables()) orelse Id =:= schema of
+      true -> Acc; %% ignore system table
+      false ->
+        Storage = mnesia:table_info(Id, storage_type),
+        Tab0 = [{name, Id},
+          {owner, Owner},
+          {size, mnesia:table_info(Id, size)},
+          {reg_name, RegName},
+          {type, mnesia:table_info(Id, type)},
+          {memory, mnesia:table_info(Id, memory) * erlang:system_info(wordsize)},
+          {storage, Storage},
+          {index, mnesia:table_info(Id, index)}
+        ],
+        Tab =
+          case Storage  of
+            _ when Storage =:= ram_copies orelse Storage =:=  disc_copies ->
+              [{fixed, ets:info(Id, fixed)}, {compressed, ets:info(Id, compressed)}|Tab0];
+            disc_only_copies ->
+              [{fixed, dets:info(Id, safe_fixed)}|Tab0];
+            _ -> Tab0
+          end,
+        [Tab|Acc]
+    end
+               end,
+  lists:foldl(CollectFun, [], mnesia:system_info(tables)).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Private
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%