aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_init.c
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-20 15:14:39 +0200
committerZandra Hird <[email protected]>2015-05-20 15:14:39 +0200
commitc714241a99cf608f290a7d8dcd9c22aae693dc97 (patch)
tree4ad43c712d89d40847be97b380660bc86180347c /erts/emulator/beam/erl_init.c
parentec906eeb9cd9a2debc7d10962e087d790a14b31c (diff)
parent4c4d7fa40e5fb59854724ce74b8aa3546525cb90 (diff)
downloadotp-c714241a99cf608f290a7d8dcd9c22aae693dc97.tar.gz
otp-c714241a99cf608f290a7d8dcd9c22aae693dc97.tar.bz2
otp-c714241a99cf608f290a7d8dcd9c22aae693dc97.zip
Merge branch 'richcarl/warnings-by-default'
* richcarl/warnings-by-default: Map error logger warnings to warning messages by default OTP-12755
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
-rw-r--r--erts/emulator/beam/erl_init.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 988ff0e2b5..33417833a9 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -625,7 +625,7 @@ void erts_usage(void)
erts_fprintf(stderr, "-v turn on chatty mode (GCs will be reported etc)\n");
- erts_fprintf(stderr, "-W<i|w> set error logger warnings mapping,\n");
+ erts_fprintf(stderr, "-W<i|w|e> set error logger warnings mapping,\n");
erts_fprintf(stderr, " see error_logger documentation for details\n");
erts_fprintf(stderr, "-zdbbl size set the distribution buffer busy limit in kilobytes\n");
erts_fprintf(stderr, " valid range is [1-%d]\n", INT_MAX/1024);
@@ -1253,7 +1253,7 @@ erl_start(int argc, char **argv)
verbose = DEBUG_DEFAULT;
#endif
- erts_error_logger_warnings = am_error;
+ erts_error_logger_warnings = am_warning;
while (i < argc) {
if (argv[i][0] != '-') {
@@ -1991,11 +1991,12 @@ erl_start(int argc, char **argv)
case 'i':
erts_error_logger_warnings = am_info;
break;
+ case 'e':
+ erts_error_logger_warnings = am_error;
+ break;
case 'w':
erts_error_logger_warnings = am_warning;
break;
- case 'e': /* The default */
- erts_error_logger_warnings = am_error;
default:
erts_fprintf(stderr, "unrecognized warning_map option %s\n", arg);
erts_usage();