diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-03-10 11:50:31 -0500 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2012-11-15 11:23:55 +0000 |
| commit | b878b5263453c9263780ffbab4ad86ff0af71063 (patch) | |
| tree | 6d72ab87e6c8bb23f4299d3e2d5779530bfb0b86 | |
| parent | 478e957f17813676ec2d1b57cde249c06d00d1e5 (diff) | |
Use twig for logging
Conflicts:
apps/couch/include/couch_db.hrl
apps/couch/src/couch_server_sup.erl
rebar.config
rel/reltool.config
| -rw-r--r-- | apps/couch/include/couch_db.hrl | 18 | ||||
| -rw-r--r-- | rel/overlay/etc/vm.args | 5 | ||||
| -rw-r--r-- | rel/reltool.config | 3 |
3 files changed, 8 insertions, 18 deletions
diff --git a/apps/couch/include/couch_db.hrl b/apps/couch/include/couch_db.hrl index 1b46786c..e8cbfff3 100644 --- a/apps/couch/include/couch_db.hrl +++ b/apps/couch/include/couch_db.hrl @@ -25,21 +25,9 @@ -define(DEFAULT_ATTACHMENT_CONTENT_TYPE, <<"application/octet-stream">>). --define(LOG_DEBUG(Format, Args), - case couch_log:debug_on() of - true -> - couch_log:debug(Format, Args); - false -> ok - end). - --define(LOG_INFO(Format, Args), - case couch_log:info_on() of - true -> - couch_log:info(Format, Args); - false -> ok - end). - --define(LOG_ERROR(Format, Args), couch_log:error(Format, Args)). +-define(LOG_DEBUG(Format, Args), twig:log(debug, Format, Args)). +-define(LOG_INFO(Format, Args), twig:log(notice, Format, Args)). +-define(LOG_ERROR(Format, Args), twig:log(error, Format, Args)). -record(rev_info, { diff --git a/rel/overlay/etc/vm.args b/rel/overlay/etc/vm.args index 03e5af27..761530f7 100644 --- a/rel/overlay/etc/vm.args +++ b/rel/overlay/etc/vm.args @@ -14,8 +14,9 @@ # in the cluster. {{cookie}} -# Tell SASL not to log progress reports --sasl errlog_type error +# Tell kernel and SASL not to log anything +-kernel error_logger silent +-sasl sasl_error_logger false # Use kernel poll functionality if supported by emulator +K true diff --git a/rel/reltool.config b/rel/reltool.config index 9fd5699d..5da3a649 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -47,7 +47,8 @@ {app, fabric, [{incl_cond, include}]}, {app, mem3, [{incl_cond, include}]}, {app, couch, [{incl_cond, include}]}, - {app, chttpd, [{incl_cond, include}]} + {app, chttpd, [{incl_cond, include}]}, + {app, twig, [{incl_cond, include}]} ]}. {overlay_vars, "bigcouch.config"}. |