diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-05-08 18:01:10 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-05-08 18:01:10 +0300 |
| commit | 7132664520b09cf6e15dc95e91ce73eedd4407e4 (patch) | |
| tree | 34d0b51dabde73dbde00e2b928e4b52450eaaee8 /priv/schema | |
| parent | d6fa2093375ac295b765261e34213de4a61960b9 (diff) | |
| parent | 0bd4b78b3540c65648563714239d2a270c9816a4 (diff) | |
| download | rabbitmq-server-git-7132664520b09cf6e15dc95e91ce73eedd4407e4.tar.gz | |
Merge branch 'master' into rabbitmq-server-1146-full
Conflicts:
Makefile
Diffstat (limited to 'priv/schema')
| -rw-r--r-- | priv/schema/rabbitmq.schema | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/priv/schema/rabbitmq.schema b/priv/schema/rabbitmq.schema index 6f3f42e4ed..fab07baeb4 100644 --- a/priv/schema/rabbitmq.schema +++ b/priv/schema/rabbitmq.schema @@ -999,7 +999,7 @@ fun(Conf) -> [{lager_console_backend, ConsoleLevel}]; false -> [] end, - FileHandler = case cuttlefish:conf_get("log.file", Conf, false) of + FileHandler = case cuttlefish:conf_get("log.file", Conf, undefined) of false -> []; File -> FileLevel = cuttlefish:conf_get("log.file.level", Conf, info), @@ -1010,6 +1010,11 @@ fun(Conf) -> {level, FileLevel}, {date, RotationDate}, {size, RotationSize}, + {formatter_config, + [date, " ", time, " ", color, + "[", severity, "] ", + {pid, ""}, + " ", message, "\n"]}, {count, RotationCount}]}] end, SyslogHandler = case cuttlefish:conf_get("log.syslog", Conf, false) of |