From 97cf04d7528b51a68ac4b1e5b3413b05bbe7fe51 Mon Sep 17 00:00:00 2001 From: HuangDan Date: Wed, 11 Oct 2017 15:59:25 +0800 Subject: [PATCH] Add more lager configuration --- etc/emq.conf | 22 ++++++++++++++-------- priv/emq.schema | 25 ++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/etc/emq.conf b/etc/emq.conf index e5fc93f75..227a22457 100644 --- a/etc/emq.conf +++ b/etc/emq.conf @@ -128,12 +128,6 @@ log.console = console ## Console log level. Enum: debug, info, notice, warning, error, critical, alert, emergency log.console.level = error -## Syslog. Enum: on, off -log.syslog = on - -## syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency -log.syslog.level = error - ## Console log file ## log.console.file = {{ platform_log_dir }}/console.log @@ -146,20 +140,32 @@ log.syslog.level = error ## Info log file ## log.info.file = {{ platform_log_dir }}/info.log +## Info log file size +## log.info.size = 10485760 + +## Info log file count +## log.info.count = 5 + ## Error log file log.error.file = {{ platform_log_dir }}/error.log ## Error log file size -## log.error.size = 10485760 +log.error.size = 10485760 ## Error log file count -## log.error.count = 5 +log.error.count = 5 ## Enable the crash log. Enum: on, off log.crash = on log.crash.file = {{ platform_log_dir }}/crash.log +## Syslog. Enum: on, off +log.syslog = on + +## syslog level. Enum: debug, info, notice, warning, error, critical, alert, emergency +log.syslog.level = error + ##-------------------------------------------------------------------- ## Allow Anonymous and Default ACL ##-------------------------------------------------------------------- diff --git a/priv/emq.schema b/priv/emq.schema index b1fdf138f..6b3f0001f 100644 --- a/priv/emq.schema +++ b/priv/emq.schema @@ -336,6 +336,20 @@ end}. {datatype, integer} ]}. +{mapping, "log.info.file", "lager.handlers", [ + {datatype, file} +]}. + +{mapping, "log.info.size", "lager.handlers", [ + {default, 10485760}, + {datatype, integer} +]}. + +{mapping, "log.info.count", "lager.handlers", [ + {default, 5}, + {datatype, integer} +]}. + {mapping, "log.error.file", "lager.handlers", [ {default, "log/error.log"}, {datatype, file} @@ -395,6 +409,15 @@ end}. {count, cuttlefish:conf_get("log.error.count", Conf)}]}] end, + InfoHandler = case cuttlefish:conf_get("log.info.file", Conf, undefined) of + undefined -> []; + InfoFilename -> [{lager_file_backend, [{file, InfoFilename}, + {level, info}, + {size, cuttlefish:conf_get("log.info.size", Conf)}, + {date, "$D0"}, + {count, cuttlefish:conf_get("log.info.count", Conf)}]}] + end, + ConsoleLogLevel = cuttlefish:conf_get("log.console.level", Conf), ConsoleLogFile = cuttlefish:conf_get("log.console.file", Conf), @@ -420,7 +443,7 @@ end}. cuttlefish:conf_get("log.syslog.level", Conf)]}] end, - ConsoleHandlers ++ ErrorHandler ++ SyslogHandler + ConsoleHandlers ++ ErrorHandler ++ InfoHandler ++ SyslogHandler end }.