[2/2] couch commit: updated refs/heads/1843-feature-bigcouch to de2160a

[rn...@apache.org]

Switch to couch_log


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/de2160ac
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/de2160ac
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/de2160ac

Branch: refs/heads/1843-feature-bigcouch
Commit: de2160ac828ce7f479c290b58fe7baf05de1c281
Parents: 4ee7c2d
Author: Robert Newson <ro...@cloudant.com>
Authored: Wed Feb 12 20:11:16 2014 +0000
Committer: Robert Newson <ro...@cloudant.com>
Committed: Wed Feb 12 21:35:32 2014 +0000

----------------------------------------------------------------------
 include/couch_db.hrl | 8 ++++----
 src/couch_file.erl   | 2 +-
 src/couch_sup.erl    | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/de2160ac/include/couch_db.hrl
----------------------------------------------------------------------
diff --git a/include/couch_db.hrl b/include/couch_db.hrl
index 2c015df..e1deeb2 100644
--- a/include/couch_db.hrl
+++ b/include/couch_db.hrl
@@ -35,10 +35,10 @@
 
 -define(DEFAULT_ATTACHMENT_CONTENT_TYPE, <<"application/octet-stream">>).
 
--define(LOG_DEBUG(Format, Args), twig:log(debug, Format, Args)).
--define(LOG_INFO(Format, Args), twig:log(info, Format, Args)).
--define(LOG_WARN(Format, Args), twig:log(warn, Format, Args)).
--define(LOG_ERROR(Format, Args), twig:log(error, Format, Args)).
+-define(LOG_DEBUG(Format, Args), couch_log:log(debug, Format, Args)).
+-define(LOG_INFO(Format, Args), couch_log:log(info, Format, Args)).
+-define(LOG_WARN(Format, Args), couch_log:log(warn, Format, Args)).
+-define(LOG_ERROR(Format, Args), couch_log:log(error, Format, Args)).
 
 % Tree::term() is really a tree(), but we don't want to require R13B04 yet
 -type branch() :: {Key::term(), Value::term(), Tree::term()}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/de2160ac/src/couch_file.erl
----------------------------------------------------------------------
diff --git a/src/couch_file.erl b/src/couch_file.erl
index 7528091..f7b10d0 100644
--- a/src/couch_file.erl
+++ b/src/couch_file.erl
@@ -167,7 +167,7 @@ pread_iolist(Fd, Pos) ->
         Md5 ->
             {ok, IoList};
         _ ->
-            twig:log(emerg, "File corruption in ~p at position ~B",
+            couch_log:log(emerg, "File corruption in ~p at position ~B",
                      [Fd, Pos]),
             exit({file_corruption, <<"file corruption">>})
         end;

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/de2160ac/src/couch_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_sup.erl b/src/couch_sup.erl
index 3508d4f..c716620 100644
--- a/src/couch_sup.erl
+++ b/src/couch_sup.erl
@@ -43,7 +43,7 @@ start_link() ->
 
 
 init(_Args) ->
-    twig:log(info, "Starting ~s", [?MODULE]),
+    couch_log:log(info, "Starting ~s", [?MODULE]),
     {ok, {{one_for_one,10, 60}, [
         {
             couch_primary_services,
@@ -77,9 +77,8 @@ handle_config_change(_, _, _, _, _) ->
 
 
 notify_starting() ->
-    io:format("Apache CouchDB ~s (LogLevel=~s) is starting.~n", [
-        couch_server:get_version(),
-        config:get("log", "level", "info")
+    io:format("Apache CouchDB ~s is starting.~n", [
+        couch_server:get_version()
     ]).