aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-05-17Merge branch 'ferd/kernel/shell-history-storage/OTP-14409'Dan Gudmundsson
* 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
2017-05-17Merge branch 'hans/ssh/cuddle_tests'Hans Nilsson
2017-05-17Merge branch 'hans/ssh/ext-info_bug_fixes'Hans Nilsson
2017-05-17Merge branch 'hans/ssh/test_rsa_sha2_/OTP-14362'Hans Nilsson
2017-05-17ssh: update testcase in ssh_to_opensshHans Nilsson
2017-05-17ssh: test case didn't set preferred_algorithmsHans Nilsson
2017-05-17ssh: update property test for sign-algorithmHans Nilsson
2017-05-17ssh: fix end_per_suite in property testcaseHans Nilsson
2017-05-17ssh: disable rsa-sha2-* for clientsHans Nilsson
because there is a bug in the client verification code for those algorithms
2017-05-17ssh: select server-sig-algs from configured algos (preferred_algorithms)Hans Nilsson
2017-05-17ssh: Use 'server-sig-algs' for client's selection of algsHans Nilsson
2017-05-17ssh: fix broken preferred_algorithms and pref_public_key_algs optionsHans Nilsson
2017-05-17ssh: make ssh_algorithms_SUITE test public user and host keysHans Nilsson
Conflicts: lib/ssh/src/ssh_transport.erl
2017-05-17ssh: Enable rsa-sha2-*Hans Nilsson
Conflicts: lib/ssh/src/ssh_transport.erl
2017-05-17Merge branch 'dgud/observer/chunk-proc-info'Dan Gudmundsson
* dgud/observer/chunk-proc-info: observer: Fix alpabetic ordering when sorting on Name observer: Handle crash when node goes down observer: listen on correct notebook change observer: chunk process list info
2017-05-17Merge branch 'dgud/wx/fix-msvc-2015'Dan Gudmundsson
* dgud/wx/fix-msvc-2015: wx: Fix builds on VS-2017
2017-05-17Add persistence to history of the non-legacy shellFred Hebert
This patch adds a mechanism by which shell history gets stored persistently on disk and gets loaded whenever a new shell session begins. The log files are added to the user's cache directory, with multiple files in it, although the location is configurable. All Erlang instances on a given host will share the same log file. There are two hook points in group.erl that are used: when instantiating the buffer, where we fetch from disk, and when adding a line to the buffer (gets stored). This allows all shell instances to use the same base set of lines when loaded, but to keep their history separate after the fact. As lines are added as you go, a new shell session (with ^G -> s -> c) will have access to previous sessions' lines. The implementation makes use of the disk_log library with a rotating log in order to store data, and allow automated repairs. By default, the feature is disabled and must be turned on through OTP environment variable part of the kernel application. The options include: | Option | Accepted values | Default | Description | | ------------------------ | ----------------- |---------- | -------------------- | | shell_history | enabled, disabled | disabled | turn feature on/off | | shell_history_path | any string | user cache| where to put files | | shell_history_file_bytes | 51200..N bytes | 512kb | max data size (>50kb)| | shell_history_drop | ["q().", ...] | [] | blacklisted lines | A version header is added to the disk_log configuration, allowing changes in the storage format to be enacted in the future (i.e. adding segmentation by node name in the same file, or encoding) without conflict. Log rotation is used with multiple log files to ensure proper enforcement of resizing without too much data loss. Because disk_log does not allow to just flush bits of content on rewrite (it truncates any full file), we instead use a wrap log and try to divide the configured size into up to 10 log files so that every time we rotate a log, we lose only 10% of the data. This remains true for corrupted files that cannot fully be repaired. This many-logs-based approach in turn forces the use of a minimal log size for the `shell_history_file_bytes` configuration, since it has to be divided by 10. The shell history is not loaded for the `user` process which, despite running the group.erl module, does not actually require history as it mostly just forwards IO protocol information.
2017-05-17add option 'quiet' to disk_logFred Hebert
This option allows to suppress output of info_msgs to error_logger when recoverable errors are encountered in disk_log by setting the value to 'true'. Defaults to 'false', the backwards compatible behaviour.
2017-05-17Fix type declaration for disk_log.hrlFred Hebert
A specific type was given as an atom rather than an actual type defintion.
2017-05-17Merge pull request #1465 from bjorng/bjorn/tools/fix-lcnt-docBjörn Gustavsson
Fix a few minor issues in the lcnt documentation
2017-05-17Merge pull request #1463 from bjorng/bjorn/simplify-building-lcnt/OTP-14407Björn Gustavsson
Simplify building a lock-counting emulator
2017-05-17Fix a few minor issues in the lcnt documentationBjörn Gustavsson
We generally avoid abbreviations such as "e.g." and "i.e." in the documentation. We write "Erlang", not "erlang" (except when referring to the erlang module).
2017-05-16Merge branch 'ingela/dtls/opts'Ingela Anderton Andin
* ingela/dtls/opts: ssl: Adopt setopts and getopts for DTLS
2017-05-16ssl: Adopt setopts and getopts for DTLSIngela Anderton Andin
2017-05-16Merge branch 'lukas/erts/trace_recv_esdp_bug/OTP-14411'Lukas Larsson
* lukas/erts/trace_recv_esdp_bug/OTP-14411: erts: the esdp is not always available in matchspec
2017-05-16Merge pull request #1452 from niku/patch-1Ingela Andin
Revise minor notation in httpc:request/[4,5]
2017-05-16Merge branch 'ingela/remove-debug'Ingela Anderton Andin
* ingela/remove-debug: ssl: Remove debug printout
2017-05-16ssl: Remove debug printoutIngela Anderton Andin
2017-05-16Merge PR-1457 from goertzenator/enif_monitor_typesSverker Eriksson
enif_monitor_process() typo
2017-05-16Merge branch 'hans/ssh/ssh_file_user_key_checks_ec_size/OTP-14410'Hans Nilsson
2017-05-16Merge branch 'hans/ssh/test_ext_info_extension/OTP-14361'Hans Nilsson
2017-05-16Merge branch 'hans/ssh/enable_auth_methods_for_clients/OTP-14399'Hans Nilsson
2017-05-16Merge pull request #1436 from garazdawi/lukas/erts/remove_unused_functionsLukas Larsson
erts: Remove old unused functions
2017-05-16erts: Remove old unused functionsLukas Larsson
The functions have been found using: https://github.com/caolanm/callcatcher
2017-05-16Merge pull request #1435 from SalikhovDinislam/static_funcLukas Larsson
erts: Make erts_schedule_proc2port_signal static
2017-05-16lcnt_SUITE: Add a smoke test for running lock-countingBjörn Gustavsson
2017-05-16Update instructions for how to start the lock-counting VMBjörn Gustavsson
2017-05-16Teach erlexec the -emu_type optionBjörn Gustavsson
Add the option -emu_type to start an emulator of a certain type. For exampe, "-emu_type lcnt" will start beam.lcnt.smp. Any string will be accepted after -emu_type. If there is no corresponding emulator, there will be an error similar to: erlexec: The emulator '.../bin/x86_64-unknown-linux-gnu/beam.foo.smp' does not exist. On Windows, there is an undocumented option "-debug". Remove that option, because -emu_type can be used instead.
2017-05-16Let --enable-lock-counter build an additional emulatorBjörn Gustavsson
"./configure --enable-lock-counter" would modify the behavior of the default emulator (usually SMP). To make lock counting more accessible, change --enable-lock-counter to build an additional emulator in the same way as: (cd erts/emulator && make lcnt) (The next commit will make it easier to start the built lock-counter emulator.)
2017-05-16Merge branch 'ingela/dtls/replay-protect/OTP-14077'Ingela Anderton Andin
* ingela/dtls/replay-protect/OTP-14077: dtls: Implement replay protection
2017-05-16dtls: Implement replay protectionIngela Anderton Andin
See RFC 6347 section 3.3
2017-05-16Merge pull request #1453 from bjorng/bjorn/catch-warning/OTP-14401Björn Gustavsson
Warn for potentially unsafe use of get_stacktrace/0
2017-05-15ssh: ssh_file:user_key/2 checks ec keytypeHans Nilsson
2017-05-15Merge pull request #1407 from eltex-ecss/auto_hibernate_timeoutIngela Andin
Add option hibernate_after to gen_server, gen_statem and gen_event. Also added to the deprecated gen_fsm behaviour. OTP14405
2017-05-15Merge pull request #1322 from tsloughter/binary_uri_encodeIngela Andin
Add unicode binary support to http_uri functions OTP-14404
2017-05-15Merge branch 'ingela/ssl/bench-certs'Ingela Anderton Andin
* ingela/ssl/bench-certs: ssl: Disable Server Name verification in bench tests for now
2017-05-15ssl: Disable Server Name verification in bench tests for nowIngela Anderton Andin
2017-05-15Fix minor typo and notation in httpc:request/[4,5]niku
2017-05-12use ErlNifMonitor instead of ErlDrvMonitor for enif_monitor/demonitorDaniel Goertzen
2017-05-12ssh: Tests for ext-info extension (ext-info-c)Hans Nilsson