Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use twig for logging

Conflicts:
	apps/couch/include/couch_db.hrl
	apps/couch/src/couch_server_sup.erl
	rebar.config
	rel/reltool.config
  • Loading branch information...
commit b878b5263453c9263780ffbab4ad86ff0af71063 1 parent 478e957
@kocolosk kocolosk authored Robert Newson committed
View
18 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,
{
View
5 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
View
3  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"}.
Please sign in to comment.
Something went wrong with that request. Please try again.