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

Converted the game server into a supervisor-compatible module.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-07-18 14:08:11 +02:00
parent b85826c06a
commit ef9b3aa03b
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebin/egs.app
View File

@ -9,7 +9,7 @@
reloader, reloader,
egs_cron, egs_cron,
egs_db, egs_db,
egs_game, psu_game,
psu_login, psu_login,
psu_patch, psu_patch,
egs_proto, egs_proto,

2
src/egs_sup.erl
View File

@ -50,7 +50,7 @@ upgrade() ->
init([]) -> init([]) ->
%% Start egs_cron, egs_game, egs_login, egs_patch. To be replaced by configurable modules. %% Start egs_cron, egs_game, egs_login, egs_patch. To be replaced by configurable modules.
Processes = [{egs_cron, {egs_cron, start, []}, permanent, 5000, worker, dynamic}, Processes = [{egs_cron, {egs_cron, start, []}, permanent, 5000, worker, dynamic},
{egs_game, {egs_game, start, []}, permanent, 5000, worker, dynamic}, {psu_game, {psu_game, start_link, [?GAME_PORT]}, permanent, 5000, worker, dynamic},
{psu_login_jp1, {psu_login, start_link, [?LOGIN_PORT_JP_ONE, 10000001]}, permanent, 5000, worker, dynamic}, {psu_login_jp1, {psu_login, start_link, [?LOGIN_PORT_JP_ONE, 10000001]}, permanent, 5000, worker, dynamic},
{psu_login_jp2, {psu_login, start_link, [?LOGIN_PORT_JP_TWO, 20000001]}, permanent, 5000, worker, dynamic}, {psu_login_jp2, {psu_login, start_link, [?LOGIN_PORT_JP_TWO, 20000001]}, permanent, 5000, worker, dynamic},
{psu_login_us, {psu_login, start_link, [?LOGIN_PORT_US, 30000001]}, permanent, 5000, worker, dynamic}, {psu_login_us, {psu_login, start_link, [?LOGIN_PORT_US, 30000001]}, permanent, 5000, worker, dynamic},

56
src/egs_game.erl → src/psu/psu_game.erl
View File

@ -1,34 +1,36 @@
% EGS: Erlang Game Server %% @author Loïc Hoguin <essen@dev-extend.eu>
% Copyright (C) 2010 Loic Hoguin %% @copyright 2010 Loïc Hoguin.
% %% @doc Handle game clients.
% This file is part of EGS. %%
% %% This file is part of EGS.
% EGS is free software: you can redistribute it and/or modify %%
% it under the terms of the GNU General Public License as published by %% EGS is free software: you can redistribute it and/or modify
% the Free Software Foundation, either version 3 of the License, or %% it under the terms of the GNU General Public License as published by
% (at your option) any later version. %% 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 %% EGS is distributed in the hope that it will be useful,
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %% but WITHOUT ANY WARRANTY; without even the implied warranty of
% GNU General Public License for more details. %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% %% GNU General Public License for more details.
% You should have received a copy of the GNU General Public License %%
% along with EGS. If not, see <http://www.gnu.org/licenses/>. %% You should have received a copy of the GNU General Public License
%% along with EGS. If not, see <http://www.gnu.org/licenses/>.
-module(egs_game). -module(psu_game).
-export([start/0]). % external -export([start_link/1]). %% External.
-export([supervisor_init/0, supervisor/0, listen/1, accept/2, process_init/2, process/0, char_select/0, area_load/4, loop/1]). % internal -export([supervisor_init/0, supervisor/0, listen/2, accept/2, process_init/2, process/0, char_select/0, area_load/4, loop/1]). %% Internal.
-include("include/records.hrl"). -include("include/records.hrl").
-include("include/network.hrl").
-include("include/maps.hrl"). -include("include/maps.hrl").
%% @doc Start the game server. -define(OPTIONS, [binary, {active, false}, {certfile, "priv/ssl/servercert.pem"}, {keyfile, "priv/ssl/serverkey.pem"}, {password, "alpha"}]).
start() -> %% @spec start_link(Port) -> {ok,Pid::pid()}
SPid = spawn_link(?MODULE, supervisor_init, []), %% @doc Start the game server.
LPid = spawn_link(?MODULE, listen, [SPid]), start_link(Port) ->
SPid = spawn(?MODULE, supervisor_init, []),
LPid = spawn(?MODULE, listen, [Port, SPid]),
{ok, LPid}. {ok, LPid}.
%% @doc Game processes supervisor initialization. %% @doc Game processes supervisor initialization.
@ -64,8 +66,8 @@ supervisor_close(Pid) ->
%% @doc Listen for connections. %% @doc Listen for connections.
listen(SPid) -> listen(Port, SPid) ->
{ok, LSocket} = ssl:listen(?GAME_PORT, ?GAME_LISTEN_OPTIONS), {ok, LSocket} = ssl:listen(Port, ?OPTIONS),
?MODULE:accept(LSocket, SPid). ?MODULE:accept(LSocket, SPid).
%% @doc Accept connections. %% @doc Accept connections.