You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/01/17 23:01:03 UTC
[44/50] git commit: Change startup order in rexi_sup
Change startup order in rexi_sup
Ensures rexi_governor comes up before rexi_server. Also removed the custom appup
BugzID:17287
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/commit/e56c018e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/tree/e56c018e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/diff/e56c018e
Branch: refs/heads/import
Commit: e56c018e63961f40e8e99367e619d6dd3d955f5f
Parents: f51ce21
Author: Bob Dionne <bo...@cloudant.com>
Authored: Wed Feb 13 14:48:59 2013 -0500
Committer: Bob Dionne <bo...@cloudant.com>
Committed: Wed Feb 13 14:48:59 2013 -0500
----------------------------------------------------------------------
ebin/rexi.appup | 33 ---------------------------------
src/rexi_sup.erl | 2 +-
2 files changed, 1 insertion(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/e56c018e/ebin/rexi.appup
----------------------------------------------------------------------
diff --git a/ebin/rexi.appup b/ebin/rexi.appup
deleted file mode 100644
index c96b8e9..0000000
--- a/ebin/rexi.appup
+++ /dev/null
@@ -1,33 +0,0 @@
-{"1.7.1",
- [
- {"1.5.7-1-gc3b0548", [
- {add_module, rexi_governor},
- {add_module, rexi_gov_manager},
- {update, rexi_sup, supervisor},
- {apply, {supervisor, restart_child, [rexi_sup, rexi_gov_manager]}},
- {load_module, rexi},
- {load_module, rexi_utils}
- ]},
- {"1.6.0-1-g871e702", [
- {add_module, rexi_governor},
- {add_module, rexi_gov_manager},
- {update, rexi_sup, supervisor},
- {apply, {supervisor, restart_child, [rexi_sup, rexi_gov_manager]}},
- {load_module, rexi},
- {load_module, rexi_utils}
- ]},
- {"1.6.0-5-g7a81f97", [
- {add_module, rexi_governor},
- {add_module, rexi_gov_manager},
- {update, rexi_sup, supervisor},
- {apply, {supervisor, restart_child, [rexi_sup, rexi_gov_manager]}},
- {load_module, rexi},
- {load_module, rexi_utils}
- ]}
- ],
- [
- {"1.5.7-1-gc3b0548", []},
- {"1.6.0-1-g871e702", []},
- {"1.6.0-5-g7a81f97", []}
- ]
-}.
http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/e56c018e/src/rexi_sup.erl
----------------------------------------------------------------------
diff --git a/src/rexi_sup.erl b/src/rexi_sup.erl
index b0273fc..86955a1 100644
--- a/src/rexi_sup.erl
+++ b/src/rexi_sup.erl
@@ -27,4 +27,4 @@ start_link(Args) ->
supervisor:start_link({local,?MODULE}, ?MODULE, Args).
init([]) ->
- {ok, {{one_for_one, 3, 10}, [?CHILD(rexi_server, worker), ?CHILD(rexi_gov_manager, worker)]}}.
+ {ok, {{one_for_one, 3, 10}, [?CHILD(rexi_gov_manager, worker), ?CHILD(rexi_server, worker)]}}.