diff options
| author | Lukas Larsson <[email protected]> | 2019-01-15 16:18:48 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-15 16:18:48 +0100 |
| commit | 5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291 (patch) | |
| tree | 3684e0c9a4d4dae2dec5c4c6ebece9a4856d47a4 /erts/preloaded | |
| parent | acc4f00fe4b3c66738aaf3f58951dbf0a96b174c (diff) | |
| parent | 9e7604027d03d3dc495499247906870e9ed0e4b8 (diff) | |
| download | otp-5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291.tar.gz otp-5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291.tar.bz2 otp-5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291.zip | |
Merge branch 'lukas/erts/set_logger_process/OTP-15375' into maint
* lukas/erts/set_logger_process/OTP-15375:
Update preloaded modules
erts: Add erlang:system_flag(system_logger,_)
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 101872 -> 101968 bytes | |||
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 17864 -> 17852 bytes | |||
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 28344 -> 28328 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
4 files changed, 5 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 0f0c2faa95..ee96878ff7 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex 5b25ceeb12..bc53a2e431 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex 09184af25e..ffb349cdf3 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index c20082a545..5730e999cb 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2526,6 +2526,9 @@ subtract(_,_) -> OldSchedulersOnline when SchedulersOnline :: pos_integer(), OldSchedulersOnline :: pos_integer(); + (system_logger, Logger) -> PrevLogger when + Logger :: logger | undefined | pid(), + PrevLogger :: logger | undefined | pid(); (trace_control_word, TCW) -> OldTCW when TCW :: non_neg_integer(), OldTCW :: non_neg_integer(); @@ -2731,8 +2734,9 @@ tuple_to_list(_Tuple) -> (schedulers | schedulers_online) -> pos_integer(); (smp_support) -> boolean(); (start_time) -> integer(); - (system_version) -> string(); (system_architecture) -> string(); + (system_logger) -> logger | undefined | pid(); + (system_version) -> string(); (threads) -> boolean(); (thread_pool_size) -> non_neg_integer(); (time_correction) -> true | false; |