couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [39/41] couch commit: updated refs/heads/import-rcouch to f07bbfc
Date Tue, 11 Feb 2014 08:07:41 GMT
add `make test` target . all erlang test pass

note: from time to time there is a timing issue on 200- test that need
to be fixed. It is most probably due to the way the indexer is
supervised.


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

Branch: refs/heads/import-rcouch
Commit: c7c431a85121b9022b8c5a3aaf471749f72cd784
Parents: 9e429fd
Author: benoitc <benoitc@apache.org>
Authored: Thu Jan 9 16:24:32 2014 +0100
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Tue Feb 11 02:05:21 2014 -0600

----------------------------------------------------------------------
 src/couch.erl            |  2 ++
 src/couch_app.erl        |  2 +-
 src/couch_os_daemons.erl | 11 ++++++-----
 src/couch_server_sup.erl |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c7c431a8/src/couch.erl
----------------------------------------------------------------------
diff --git a/src/couch.erl b/src/couch.erl
index 92c2b74..8526e68 100644
--- a/src/couch.erl
+++ b/src/couch.erl
@@ -43,6 +43,8 @@ release_version() ->
     end.
 
 start() ->
+    application:load(couch),
+    couch_util:start_app_deps(couch),
     application:start(couch).
 
 stop() ->

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c7c431a8/src/couch_app.erl
----------------------------------------------------------------------
diff --git a/src/couch_app.erl b/src/couch_app.erl
index a8d215e..414a5c9 100644
--- a/src/couch_app.erl
+++ b/src/couch_app.erl
@@ -18,7 +18,7 @@
 
 -export([start/2, stop/1]).
 
--define(CONF_FILES, ["couch.ini", "couch_httpd.ini", "local.ini"]).
+-define(CONF_FILES, ["couch.ini", "local.ini"]).
 
 start(_Type, _Args) ->
     couch_util:start_app_deps(couch),

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c7c431a8/src/couch_os_daemons.erl
----------------------------------------------------------------------
diff --git a/src/couch_os_daemons.erl b/src/couch_os_daemons.erl
index cac031a..75a14d8 100644
--- a/src/couch_os_daemons.erl
+++ b/src/couch_os_daemons.erl
@@ -164,6 +164,7 @@ handle_info({Port, {data, {eol, Data}}}, Table) ->
         _Else ->
             D2 = case (catch ?JSON_DECODE(Line)) of
                 {invalid_json, Rejected} ->
+                    io:format("fuckk so ~p~n", [Line]),
                     ?LOG_ERROR("Ignoring OS daemon request: ~p", [Rejected]),
                     D;
                 JSON ->
@@ -271,12 +272,12 @@ handle_log_message(Name, Msg, Level) ->
 reload_daemons(Table) ->
     % List of daemons we want to have running.
     Configured = lists:sort(couch_config:get("os_daemons")),
-    
+
     % Remove records for daemons that were halted.
     MSpecHalted = #daemon{name='$1', cmd='$2', status=halted, _='_'},
     Halted = lists:sort([{N, C} || [N, C] <- ets:match(Table, MSpecHalted)]),
     ok = stop_os_daemons(Table, find_to_stop(Configured, Halted, [])),
-    
+
     % Stop daemons that are running
     % Start newly configured daemons
     MSpecRunning = #daemon{name='$1', cmd='$2', status=running, _='_'},
@@ -304,7 +305,7 @@ restart_daemons(Table, Sect, Key, Port) ->
             ok
     end,
     restart_daemons(Table, Sect, Key, ets:next(Table, Port)).
-    
+
 
 stop_os_daemons(_Table, []) ->
     ok;
@@ -320,14 +321,14 @@ stop_os_daemons(Table, [{Name, Cmd} | Rest]) ->
             true = ets:insert(Table, D2)
     end,
     stop_os_daemons(Table, Rest).
-    
+
 boot_os_daemons(_Table, []) ->
     ok;
 boot_os_daemons(Table, [{Name, Cmd} | Rest]) ->
     {ok, Port} = start_port(Cmd),
     true = ets:insert(Table, #daemon{port=Port, name=Name, cmd=Cmd}),
     boot_os_daemons(Table, Rest).
-    
+
 % Elements unique to the configured set need to be booted.
 find_to_boot([], _Rest, Acc) ->
     % Nothing else configured.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/c7c431a8/src/couch_server_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_server_sup.erl b/src/couch_server_sup.erl
index be3c3a3..379b384 100644
--- a/src/couch_server_sup.erl
+++ b/src/couch_server_sup.erl
@@ -114,7 +114,7 @@ start_server(IniFiles) ->
         end
     end
     || Uri <- Uris],
-    case couch_config:get("couchdb", "uri_file", null) of 
+    case couch_config:get("couchdb", "uri_file", null) of
     null -> ok;
     UriFile ->
         Lines = [begin case Uri of


Mime
View raw message