Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add egs_servers_sup to properly handle dependencies on egs_conf at startup.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-15 01:34:50 +01:00
parent ea25d1bd74
commit 9247e51fb7
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/egs_servers_sup.erl Normal file
View File

@ -0,0 +1,43 @@
%% @author Loïc Hoguin <essen@dev-extend.eu>
%% @copyright 2011 Loïc Hoguin.
%% @doc Supervisor for the patch, login and game listener processes.
%%
%% This file is part of EGS.
%%
%% EGS is free software: you can redistribute it and/or modify
%% it under the terms of the GNU Affero General Public License as
%% published by the Free Software Foundation, either version 3 of the
%% License, or (at your option) any later version.
%%
%% EGS is distributed in the hope that it will be useful,
%% but WITHOUT ANY WARRANTY; without even the implied warranty of
%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
%% GNU Affero General Public License for more details.
%%
%% You should have received a copy of the GNU Affero General Public License
%% along with EGS. If not, see <http://www.gnu.org/licenses/>.
-module(egs_servers_sup).
-behaviour(supervisor).
-export([start_link/0]). %% API.
-export([init/1]). %% supervisor.
-define(SUPERVISOR, ?MODULE).
%% API.
-spec start_link() -> {ok, Pid::pid()}.
start_link() ->
supervisor:start_link({local, ?SUPERVISOR}, ?MODULE, []).
%% supervisor.
init([]) ->
PatchPorts = egs_conf:read(patch_ports),
LoginPorts = egs_conf:read(login_ports),
{_ServerIP, GamePort} = egs_conf:read(game_server),
PatchProcs = [{{egs_patch_server, Port}, {egs_patch_server, start_link, [Port]}, permanent, 5000, worker, dynamic} || Port <- PatchPorts],
LoginProcs = [{{egs_login_server, Port}, {egs_login_server, start_link, [Port]}, permanent, 5000, worker, dynamic} || Port <- LoginPorts],
Procs = lists:flatten([PatchProcs, LoginProcs, {egs_game_server, {egs_game_server, start_link, [GamePort]}, permanent, 5000, worker, dynamic}]),
{ok, {{one_for_one, 10, 10}, Procs}}.

16
src/egs_sup.erl
View File

@ -45,15 +45,10 @@ upgrade() ->
%% @spec init([]) -> SupervisorTree
%% @doc supervisor callback.
%% @todo Probably link egs_conf to a supervisor too.
init([]) ->
egs_conf:start_link(),
PatchPorts = egs_conf:read(patch_ports),
LoginPorts = egs_conf:read(login_ports),
{_ServerIP, GamePort} = egs_conf:read(game_server),
PatchProcs = [{{egs_patch_server, Port}, {egs_patch_server, start_link, [Port]}, permanent, 5000, worker, dynamic} || Port <- PatchPorts],
LoginProcs = [{{egs_login_server, Port}, {egs_login_server, start_link, [Port]}, permanent, 5000, worker, dynamic} || Port <- LoginPorts],
OtherProcs = [
Procs = [
{egs_conf, {egs_conf, start_link, []}, permanent, 5000, worker, dynamic},
{egs_servers_sup, {egs_servers_sup, start_link, []}, permanent, 5000, supervisor, [egs_servers_sup]},
{egs_quests_sup, {egs_quests_sup, start_link, []}, permanent, 5000, supervisor, [egs_quests_sup]},
{egs_zones_sup, {egs_zones_sup, start_link, []}, permanent, 5000, supervisor, [egs_zones_sup]},
{egs_seasons, {egs_seasons, start_link, []}, permanent, 5000, worker, dynamic},
@ -63,7 +58,6 @@ init([]) ->
{egs_patch_files_db, {egs_patch_files_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_quests_db, {egs_quests_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_shops_db, {egs_shops_db, start_link, []}, permanent, 5000, worker, dynamic},
{egs_universes, {egs_universes, start_link, []}, permanent, 5000, worker, dynamic},
{egs_game_server, {egs_game_server, start_link, [GamePort]}, permanent, 5000, worker, dynamic}
{egs_universes, {egs_universes, start_link, []}, permanent, 5000, worker, dynamic}
],
{ok, {{one_for_one, 10, 10}, PatchProcs ++ LoginProcs ++ OtherProcs}}.
{ok, {{one_for_one, 10, 10}, Procs}}.