override logging level + quickfix

GrispLasp · Aug 3, 2018 · eaf54d5 · eaf54d5
1 parent 783e009
commit eaf54d5
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 40 deletions.
diff --git a/node/Makefile b/node/Makefile
@@ -27,7 +27,7 @@ VERSION 	       ?= 0.1.0
 
 # .PHONY: grispbuild rel deps test plots dcos logs fpm no-cfg-build tarball-build build
 
-.PHONY: compile shell 2shell 3shell deploy 10deploy 11deploy rel stage \
+.PHONY: compile testshell shell 2shell 3shell deploy 10deploy 11deploy rel stage \
 	# cleaning targets :
 	clean buildclean grispclean cacheclean elixirclean checkoutsclean ⁠\
 	# currently not working targets :
@@ -83,6 +83,9 @@ checkoutsclean:
 # Test targets
 #
 
+testshell:
+	$(REBAR) as test shell --sname $(GRISPAPP) --setcookie $(COOKIE)
+
 shell:
 	$(REBAR) as test shell --sname $(GRISPAPP) --setcookie $(COOKIE) --apps node
 

diff --git a/node/config/sys.config b/node/config/sys.config
@@ -32,6 +32,26 @@
     {data_dir, "data"}
 ]},
 
+{lager, [
+  {handlers, [
+    {lager_console_backend, [{level, notice}]}
+  ]}
+]},
+
+{logger, [
+  {level, notice}
+]},
+
+{kernel, [
+    {logger_level, notice},
+    {logger, [{handler,
+      default,
+      logger_std_h,
+      #{level => notice,
+        formatter => {logger_formatter, #{single_line => true}}}
+   }]}
+]},
+
 {lasp, [{membership, false},
         {storage_backend, lasp_ets_storage_backend},
         % {mode, state_based},
@@ -42,31 +62,14 @@
         {state_sync_interval, 2000},
         {delta_interval, 2000}]},
 
-{lager, [
-  {handlers, [
-    {lager_console_backend, [{level, notice}]}
-  ]}
-]},
-
-% {logger, [
-%   {level, error}
-% ]},
 % {os_mon, [
 %   {start_os_sup, true},
 %   {start_cpu_sup, true},
 %   {start_disk_sup, false}[
 % {task1,all,#Fun<node_app.0.34321799>,{<0.1007.0>,#Ref<0.1812322877.440926209.151804>}},0]
 % ]},
 % lists:flatlength([{task1,all,#Fun<node_app.0.34321799>,{<0.1007.0>,#Ref<0.1812322877.440926209.151804>}},0]).
-{kernel, [
-    {logger_level, notice},
-    {logger, [{handler,
-      default,
-      logger_std_h,
-      #{level => notice,
-        formatter => {logger_formatter, #{single_line => true}}}
-   }]}
-]},
+
 
 {plumtree, [{broadcast_exchange_timer, 2000},
            {broadcast_mods, [lasp_plumtree_backend]}]},

diff --git a/node/config/test.config b/node/config/test.config
@@ -32,44 +32,46 @@
     {time_multiplier,   2}
 ]},
 
-{lasp, [{membership, false},
-        {storage_backend, lasp_ets_storage_backend},
-        % {mode, state_based},
-        {mode, delta_based},
-        % see https://github.com/lasp-lang/lasp/commit/a9422207e554e47495c7c488450a238274844eb9
-        {propagate_on_update, true},
-        {plumtree_peer_refresh_interval, 1000},
-        {state_sync_interval, 1000},
-        {delta_interval, 1000}]},
-
 {lager, [
   {handlers, [
-    {lager_console_backend, [{level, info}]}
+    {lager_console_backend, [{level, notice}]}
     % {lager_console_backend, [{level, error}]}
   ]}
 ]},
 
-% {logger, [
-%   {level, error}
-% ]},
+{logger, [
+    #{level => notice,
+    formatter => {logger_formatter, #{single_line => true}}}
+]},
 % {os_mon, [
 %   {start_os_sup, true},
 %   {start_cpu_sup, true},
 %   {start_disk_sup, false}
 % ]},
 
 {kernel, [
-    {logger_level, info},
+    {logger_level, notice},
     {logger, [{handler,
       default,
       logger_std_h,
       % #{level => error,
       % #{level => notice,
-      #{level => info,
+      #{level => notice,
       formatter => {logger_formatter, #{single_line => true}}}
    }]}
 ]},
 
+
+{lasp, [{membership, false},
+        {storage_backend, lasp_ets_storage_backend},
+        % {mode, state_based},
+        {mode, delta_based},
+        % see https://github.com/lasp-lang/lasp/commit/a9422207e554e47495c7c488450a238274844eb9
+        {propagate_on_update, true},
+        {plumtree_peer_refresh_interval, 1000},
+        {state_sync_interval, 1000},
+        {delta_interval, 1000}]},
+
 {plumtree, [{broadcast_exchange_timer, 300},
            {broadcast_mods, [lasp_plumtree_backend]}]},
 

diff --git a/node/rebar.config b/node/rebar.config
@@ -17,6 +17,13 @@
     {numerix, {elixir, "numerix", "0.5.1"}}
 ]}.
 
+{erl_opts, [
+    {parse_transform, lager_transform},
+    debug_info,
+    nowarn_unused_vars
+    % {i, "elixir_libs/computedge/deps/numerix/lib/"},
+]}.
+
 {plugins, [
     % {erl_tidy_prv_fmt, ".*", {git, "git://github.com/tsloughter/erl_tidy.git", {branch, "master"}}},
     {rebar3_elixir_compile, ".*", {git, "https://github.com/barrel-db/rebar3_elixir_compile.git", {branch, "master"}}}
@@ -27,10 +34,6 @@
   {pre, [{release, {ex, compile}}]}
 ]}.
 
-{erl_opts, [debug_info,
-    nowarn_unused_vars,
-    % {i, "elixir_libs/computedge/deps/numerix/lib/"},
-    {parse_transform, lager_transform}]}.
 
 % See commit below for Elixir warning origin :
 % https://github.com/elixir-lang/elixir/blob/f07f955659707e2b2a06e218d2cd2cbf94d9ff13/lib/elixir/lib/code/formatter.ex#L209
@@ -114,7 +117,7 @@
             {gen_stage, {elixir, "gen_stage", "0.14.0"}},
             {numerix, {elixir, "numerix", "0.5.1"}}
         ]},
-        {shell, [{apps, [node]},
+        {shell, [{apps, []},
                 {config, "config/test.config"}]},
         {relx, [
             {release, {node , "0.1.0"}, [