From 2e345b84dac07d71396d2c7ad651eb8af52be3d4 Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <adam@cloudant.com>
Date: Fri, 27 Aug 2010 15:10:44 -0400
Subject: remove some logging

---
 apps/couch/src/couch_server.erl | 7 -------
 apps/mem3/src/mem3_util.erl     | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/couch/src/couch_server.erl b/apps/couch/src/couch_server.erl
index dfb523b9..d1fc0e5b 100644
--- a/apps/couch/src/couch_server.erl
+++ b/apps/couch/src/couch_server.erl
@@ -207,7 +207,6 @@ try_close_lru(StartTime) ->
 
 open_async(Server, From, DbName, Filepath, Options) ->
     Parent = self(),
-    put({async_open, DbName}, now()),
     Opener = spawn_link(fun() ->
         Res = couch_db:start_link(DbName, Filepath, Options),
         gen_server:call(Parent, {open_result, DbName, Res}, infinity),
@@ -239,10 +238,6 @@ handle_call(get_server, _From, Server) ->
     {reply, {ok, Server}, Server};
 handle_call({open_result, DbName, {ok, Db}}, _From, Server) ->
     link(Db#db.main_pid),
-    case erase({async_open, DbName}) of undefined -> ok; T0 ->
-        ?LOG_INFO("needed ~p ms to open new ~s", [timer:now_diff(now(),T0)/1000,
-            DbName])
-    end,
     % icky hack of field values - compactor_pid used to store clients
     [#db{compactor_pid=Froms}] = ets:lookup(couch_dbs, DbName),
     [gen_server:reply(From, {ok, Db}) || From <- Froms],
@@ -252,7 +247,6 @@ handle_call({open_result, DbName, Error}, _From, Server) ->
     % icky hack of field values - compactor_pid used to store clients
     [#db{compactor_pid=Froms}] = ets:lookup(couch_dbs, DbName),
     [gen_server:reply(From, Error) || From <- Froms],
-    ?LOG_INFO("open_result error ~p for ~s", [Error, DbName]),
     true = ets:delete(couch_dbs, DbName),
     {reply, ok, Server#server{dbs_open=Server#server.dbs_open - 1}};
 handle_call({open, DbName, Options}, From, Server) ->
@@ -273,7 +267,6 @@ handle_call({open, DbName, Options}, From, Server) ->
         end;
     [#db{compactor_pid = Froms} = Db] when is_list(Froms) ->
         % icky hack of field values - compactor_pid used to store clients
-        ?LOG_INFO("adding another listener to async open for ~s", [DbName]),
         true = ets:insert(couch_dbs, Db#db{compactor_pid = [From|Froms]}),
         {noreply, Server};
     [#db{} = Db] ->
diff --git a/apps/mem3/src/mem3_util.erl b/apps/mem3/src/mem3_util.erl
index 2ed84db6..d8ed42b7 100644
--- a/apps/mem3/src/mem3_util.erl
+++ b/apps/mem3/src/mem3_util.erl
@@ -48,7 +48,7 @@ write_db_doc(Doc) ->
     try
         update_db_doc(Db, Doc)
     catch conflict ->
-        ?LOG_ERROR("conflict writing db doc, must be a race", [])
+        ok % assume this is a race with another shard on this node
     after
         couch_db:close(Db)
     end.
-- 
cgit v1.2.3