diff options
| author | Dan Gudmundsson <[email protected]> | 2017-05-17 15:29:59 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-05-17 15:29:59 +0200 |
| commit | 91da20e4cc10a1b73672e558be34b14adc8ac0ae (patch) | |
| tree | 47361ae8fb89bc5e3f81075352aa8010ae609c12 /lib/kernel/doc | |
| parent | 950c96c30d241bd65abcd79a8a5d8846cd845b05 (diff) | |
| parent | 4b9e1dd37f6e55ba1a04fad36d8ed3c0201b1942 (diff) | |
| download | otp-91da20e4cc10a1b73672e558be34b14adc8ac0ae.tar.gz otp-91da20e4cc10a1b73672e558be34b14adc8ac0ae.tar.bz2 otp-91da20e4cc10a1b73672e558be34b14adc8ac0ae.zip | |
Merge branch 'ferd/kernel/shell-history-storage/OTP-14409'
* ferd/kernel/shell-history-storage/OTP-14409:
Add persistence to history of the non-legacy shell
add option 'quiet' to disk_log
Fix type declaration for disk_log.hrl
Diffstat (limited to 'lib/kernel/doc')
| -rw-r--r-- | lib/kernel/doc/src/disk_log.xml | 6 | ||||
| -rw-r--r-- | lib/kernel/doc/src/kernel_app.xml | 23 |
2 files changed, 29 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml index aebeacee28..570d3ef9bd 100644 --- a/lib/kernel/doc/src/disk_log.xml +++ b/lib/kernel/doc/src/disk_log.xml @@ -968,6 +968,12 @@ <c>read_write</c>. </p> </item> + <tag><c>{quiet, Boolean}</c></tag> + <item> + <p>Specifies if messages will be sent to + <c>error_logger</c> on recoverable errors with + the log files. Defaults to <c>true</c>.</p> + </item> </taglist> <p><c>open/1</c> returns <c>{ok, <anno>Log</anno>}</c> if the log file is successfully opened. If the file is diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml index 28af155493..9fccb4c7ac 100644 --- a/lib/kernel/doc/src/kernel_app.xml +++ b/lib/kernel/doc/src/kernel_app.xml @@ -419,6 +419,29 @@ MaxT = TickTime + TickTime / 4</code> using this service.</p> <p>Defaults to <c>false</c>.</p> </item> + <tag><c>shell_history = enabled | disabled </c></tag> + <item> + <p>Specifies whether shell history should be logged to disk + between usages of <c>erl</c>.</p> + </item> + <tag><c>shell_history_drop = [string()]</c></tag> + <item> + <p>Specific log lines that should not be persisted. For + example <c>["q().", "init:stop()."]</c> will allow to + ignore commands that shut the node down. Defaults to + <c>[]</c>.</p> + </item> + <tag><c>shell_history_file_bytes = integer()</c></tag> + <item> + <p>how many bytes the shell should remember. By default, the + value is set to 512kb, and the minimal value is 50kb.</p> + </item> + <tag><c>shell_history_path = string()</c></tag> + <item> + <p>Specifies where the shell history files will be stored. + defaults to the user's cache directory as returned by + <c>filename:basedir(user_cache, "erlang-history")</c>.</p> + </item> <tag><c>shutdown_func = {Mod, Func}</c></tag> <item> <p>Where:</p> |