diff --git a/config/config.exs b/config/config.exs index c5c2b5b..bb906fb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -5,6 +5,6 @@ import Config config :logger, :default_formatter, format: "$date $time [$level] $metadata $message\n", colors: [enabled: false], - metadata: [:mfa] + metadata: [:mfa, :pid] import_config "#{config_env()}.exs" diff --git a/config/test.exs b/config/test.exs index 6a7c3f7..5185143 100644 --- a/config/test.exs +++ b/config/test.exs @@ -3,7 +3,7 @@ import Config config :logger, :default_handler, - level: :info, + level: System.get_env("SCOPES_LOG_LEVEL", "info") |> String.to_atom, config: [ file: ~c"test/log/scopes_test.log" ] diff --git a/lib/csys/program.ex b/lib/csys/program.ex index 88a6d9c..a144cc7 100644 --- a/lib/csys/program.ex +++ b/lib/csys/program.ex @@ -76,7 +76,7 @@ defmodule Scopes.CSys.Program do limit = args[:limit] data = Shape.data(msg) state = CSys.state(scope) - Logger.debug(Util.show [data, state.value, threshold, self()]) + Logger.debug(Util.show [data, state.value, threshold]) value_n = state.value + data.value if value_n >= threshold do value_out = limit && rem(value_n - 1, limit) + limit || value_n diff --git a/test/csys_test.exs b/test/csys_test.exs index b7cc7e9..c116f66 100644 --- a/test/csys_test.exs +++ b/test/csys_test.exs @@ -19,7 +19,7 @@ defmodule Scopes.CSysTest do describe "basic-program:" do test "minimal-b1" do env = Environ.setup(Program.prepare_basic(), Program.init_seq_b1()) - Process.sleep(30) + Process.sleep(50) Environ.forward_value(env, [:csys, :c00, {0, 0}], 0) assert 0 = receive_data().value Environ.forward_value(env, [:csys, :s01, {1, 0}], 1) @@ -33,7 +33,7 @@ defmodule Scopes.CSysTest do test "recursive-1" do env = Environ.setup(Program.prepare_basic(), Program.init_recursive_1()) - Process.sleep(30) + Process.sleep(50) Environ.forward_value(env, [:csys, :s01, {1, 1}], 42) assert receive_data().value == 42 Environ.forward_value(env, [:csys, :s01, {1, 1}], 47)