aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/Makefile
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-07-13 12:23:01 +0200
committerSiri Hansen <[email protected]>2018-07-13 12:23:01 +0200
commit6ff0857f6385848248f38e6315881f6ffc44729f (patch)
tree56e63d6888873877b3858cd2a6ff6566c7510220 /lib/kernel/src/Makefile
parentadb0b077e7ee5b0d9b140bb985b56a43d82927cd (diff)
parent48824be3d833b13a35b92652df372c6ce3c190a0 (diff)
downloadotp-6ff0857f6385848248f38e6315881f6ffc44729f.tar.gz
otp-6ff0857f6385848248f38e6315881f6ffc44729f.tar.bz2
otp-6ff0857f6385848248f38e6315881f6ffc44729f.zip
Merge branch 'siri/logger/post-21/OTP-15132' into maint
* siri/logger/post-21/OTP-15132: [logger] Allow setting kernel parameter 'logger_level' to 'all' [kernel] Reduce risk of dead lock when terminating logger_sup [logger] Fix regexp replacement for unicode strings Update proc_lib:report_cb to obey logger formatter's size limiting params [logger] Allow report callback with two arguments returning a string Don't call report_cb from cth_log_redirect - formatter does that Add legacy test of sasl_report_file_h and size limiting [logger] Remove compiler warnings in test [logger] Fix problem with test cases waiting for handler restart [logger] Add ?LOG macro which takes Level as argument [logger] Improve spec for set_handler_config/3 and set_primary_config/2 [logger] Generate .png file from .dia [logger] Update documentation
Diffstat (limited to 'lib/kernel/src/Makefile')
-rw-r--r--lib/kernel/src/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index c595c25341..57f17defc8 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -112,7 +112,8 @@ MODULES = \
logger \
logger_backend \
logger_config \
- logger_std_h \
+ logger_handler_watcher \
+ logger_std_h \
logger_disk_log_h \
logger_h_common \
logger_filters \