remove legacy staff

apps/server/include/classes.hrl

@@ -1,36 +0,0 @@
-%%%
-%%% #object can be passed to amf:encode
-%%%
--type amf0() :: any().
-
--record(object, {
-          name          :: string(),
-          members = []  :: list(tuple(atom(), amf0()))
-         }).
-%%%
-%%% Next four are packed into #object before amf:encode
-%%%
--record('KamfRequest', {
-          id        :: any(),
-          method    :: string(),
-          args = [] :: list(tuple(atom(), any()))
-         }).
-
--record('KamfResponse', {
-          id      :: any(),
-          success :: boolean(),
-          result  :: any()
-         }).
-
--record('KamfMessage', {
-          id         :: any(),
-          event_type :: string(),
-          args = []  :: list(tuple(atom(), any()))
-         }).
-
--record('KamfFatalError', {
-          type   :: atom(), %% request or message
-          id     :: any(),
-          reason :: string()
-         }).
-

apps/server/include/conf.hrl

@@ -1 +0,0 @@
--define(LISTEN_PORT, nsx_opt:get_env(nsg_srv, game_srv_port, 9000)).

apps/server/include/config.hrl

@@ -1,3 +0,0 @@
--define(PRODUCTION, false).
-
-

apps/server/include/games.hrl

@@ -1,17 +0,0 @@
-%%%
-%%% Message is sent when matchmaker finds match.
-%%%
--record('PlayerResults', {
-          player_id,           %%
-          disconnected = false :: boolean(),
-          winner = <<"none">>  :: binary(), %% similar to skill_delta
-          skill,               %% skill level the start of the game
-          skill_delta,         %% 0 for defeat, 0.25 for draw and 1 for win
-          score = 0,           %% total accumulated score for this set
-          score_delta = 0     %% delta of okey game points
-         }).
-
--record('GameResults', {
-          game_id :: integer(),
-          results = []       :: list(#'PlayerResults'{})
-         }).

apps/server/include/kamf.hrl

@@ -1,3 +0,0 @@
--define(KAMF_VERSION, 1).
--define(KAMF_MAGIC, 16#ccaaccaa0001).
--define(AMF, kamf).

apps/server/include/log.hrl

@@ -1,57 +0,0 @@
--define(LOG(Format, Args, Level, Tags), error_logger:info_msg("~p:~p " ++ Format,[?MODULE,?LINE] ++ Args)).
-
--define(LOGGER_STUB_3, fun(_,_,_) -> true end).
--define(LOGGER_STUB_2, fun(_,_) -> true end).
--define(LOGGER_STUB_1, fun(_) -> true end).
-
-
--ifdef(SERVER_LOG_VERBOSE).
--ifdef(SERVER_LOG_DEBUG).
-
--define(DBG(Format, Args, Tag), ?LOG(Format, Args, ?debug, Tag)).
--define(DBG(Format, Args),      ?DBG(Format, Args, [])).
--define(DBG(Format),            ?DBG(Format, [])).
-
--else. %% LOG_DEBUG
-
--define(DBG(Format, Args, Tag), ?LOGGER_STUB_3(Format, Args, Tag)).
--define(DBG(Format, Args),      ?LOGGER_STUB_2(Format, Args)).
--define(DBG(Format),            ?LOGGER_STUB_1(Format)).
-
--endif. %% LOG_DEBUG
-
--define(INFO(Format, Args, Tag), ?LOG(Format, Args, ?info, Tag)).
--define(INFO(Format, Args),      ?INFO(Format, Args, [])).
--define(INFO(Format),            ?INFO(Format, [])).
-
--else. %% LOG_VERBOSE
-
--define(INFO(Format, Args, Tag), ?LOGGER_STUB_3(Format, Args, Tag)).
--define(INFO(Format, Args),      ?LOGGER_STUB_2(Format, Args)).
--define(INFO(Format),            ?LOGGER_STUB_1(Format)).
-
--endif. %% LOG_VERBOSE
-
--define(NOTICE(Format, Args, Tag), ?LOG(Format, Args, ?notice, Tag)).
--define(NOTICE(Format, Args),      ?NOTICE(Format, Args, [])).
--define(NOTICE(Format),            ?NOTICE(Format, [])).
-
--define(WARNING(Format, Args, Tag), ?LOG(Format, Args, ?warning, Tag)).
--define(WARNING(Format, Args),      ?WARNING(Format, Args, [])).
--define(WARNING(Format),            ?WARNING(Format, [])).
-
--define(ERROR(Format, Args, Tag), ?LOG(Format, Args, ?error, Tag)).
--define(ERROR(Format, Args),      ?ERROR(Format, Args, [])).
--define(ERROR(Format),            ?ERROR(Format, [])).
-
--define(CRITICAL(Format, Args, Tag), ?LOG(Format, Args, ?critical, Tag)).
--define(CRITICAL(Format, Args),      ?CRITICAL(Format, Args, [])).
--define(CRITICAL(Format),            ?CRITICAL(Format, [])).
-
--define(ALERT(Format, Args, Tag), ?LOG(Format, Args, ?alert, Tag)).
--define(ALERT(Format, Args),      ?ALERT(Format, Args, [])).
--define(ALERT(Format),            ?ALERT(Format, [])).
-
--define(EMERGENCY(Format, Args, Tag), ?LOG(Format, Args, ?emergency, Tag)).
--define(EMERGENCY(Format, Args),      ?EMERGENCY(Format, Args, [])).
--define(EMERGENCY(Format),            ?EMERGENCY(Format, [])).

apps/server/include/logging.hrl

@@ -1,16 +0,0 @@
--define(LOG(Format, Args),
-	io:format("~p:~p:~p:~p::: " ++ Format ++ "~n", [self(), ?MODULE, ?LINE, erlang:localtime() | Args])).
-
--define(PP(Format, Args),
-	io:format("~p:~p:~p::: " ++ Format ++ "~n", [self(), ?MODULE, ?LINE | Args])).
-
-% -define(DEBUG(Format, Args),
-%         io:format("~p:~p:~p::: " ++ Format ++ "~n", [self(), ?MODULE, ?LINE | Args])).
-
--define(DP(Format, Args),
-	io:format(user, "~p:~p:~p::: " ++ Format ++ "~n", [self(), ?MODULE, ?LINE | Args])).
-
-%% -define(PP(F, A), ok).
-%% -define(DP(F, A), ok).
--define(DEBUG(F,A), ok).
-%% -define(LOG(F, A), ok).

apps/server/include/settings.hrl

@@ -7,3 +7,9 @@
 -define(TEST_TOKEN,  "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8UnA==").
 -define(TEST_TOKEN2, "EBAs6dg2Xw6XuCdg8qiPmlBLgYJ6N4Ti0P+oGpWgYz4NW4nBBUzTe/wAuLYtPnjFpsjCExxSpV78fipmsPxcf+NGy+QKIM6rmVJhpnIlKf0bpFNuGaAPjZAWthhGO8nZ0V8Un2==").
 -define(PAIRED_TAVLA_ASYNC, false).
+-define(SOCIAL_ACTION_SUBSCRIBE, 1).
+-define(SOCIAL_ACTION_UNSUBSCRIBE, 2).
+-define(SOCIAL_ACTION_BLOCK, 3).
+-define(SOCIAL_ACTION_UNBLOCK, 4).
+-define(SOCIAL_ACTION_LOVE, 5).
+-define(SOCIAL_ACTION_HAMMER, 6).

apps/server/src/auth_server.erl

@@ -1,8 +1,6 @@
 -module(auth_server).
 
--include_lib("server/include/conf.hrl").
 -include_lib("server/include/settings.hrl").
--include_lib("server/include/log.hrl").
 -include_lib("server/include/authtoken.hrl").
 -include_lib("server/include/requests.hrl").
 -include_lib("kvs/include/user.hrl").

apps/server/src/fake_users.erl

@@ -2,7 +2,6 @@
 -compile(export_all).
 -include_lib("db/include/config.hrl").
 -include_lib("kvs/include/user.hrl").
--include_lib("server/include/log.hrl").
 
 names() ->
    ["pinar","betul","eda","lale","ilgin","alp","ayberk","mehmet","ozan","doruk",

apps/server/src/game_manager.erl

@@ -4,10 +4,8 @@
 -compile(export_all).
 -export([init/1, start/0, start_link/0, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 -include_lib("server/include/requests.hrl").
--include_lib("server/include/conf.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/tournaments.hrl").
--include_lib("server/include/log.hrl").
 -include_lib("stdlib/include/qlc.hrl").
 -include_lib("db/include/scoring.hrl").
 -record(state, { game_tavla = 0, game_okey = 0 }).
@@ -346,7 +344,7 @@ create_elimination_trn(GameType, Params, Registrants) ->
     Awards        = proplists:get_value(awards, Params),
     RegistrantsNum = length(Registrants),
     if RegistrantsNum =/= PlayersNumber ->
-           ?ERROR("create_elimination_trn/3 Error: Wrong number of the registrants: ~p (required: ~p). ",
+           gas:error(?MODULE,"create_elimination_trn/3 Error: Wrong number of the registrants: ~p (required: ~p). ",
                   [RegistrantsNum, PlayersNumber]),
            exit(wrong_registrants_number);
        true -> do_nothing

apps/server/src/game_session.erl

@@ -1,13 +1,8 @@
 -module(game_session).
 -behaviour(gen_server).
 
--include_lib("server/include/social_actions.hrl").
--include_lib("server/include/logging.hrl").
--include_lib("server/include/games.hrl").
--include_lib("server/include/classes.hrl").
 -include_lib("server/include/requests.hrl").
 -include_lib("server/include/settings.hrl").
--include_lib("server/include/log.hrl").
 
 -export([start_link/1]).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).

apps/server/src/game_stats.erl

@@ -8,8 +8,6 @@
 -include_lib("server/include/basic_types.hrl").
 -include_lib("server/include/game_okey.hrl").
 -include_lib("server/include/game_tavla.hrl").
--include_lib("server/include/log.hrl").
--include_lib("server/include/games.hrl").
 -include_lib("db/include/transaction.hrl").
 -include_lib("db/include/scoring.hrl").
 

apps/server/src/game_sup.erl

@@ -1,7 +1,6 @@
 -module(game_sup).
 -behaviour(supervisor).
 -export([start_link/0, stop/0]).
--include_lib("server/include/conf.hrl").
 -export([init/1, start/0, start_game/3, stop_game/2]).
 -define(SERVER, ?MODULE).
 

apps/server/src/known_records.erl

@@ -1,7 +1,6 @@
 -module(known_records).
 
 -include("types.hrl").
--include("classes.hrl").
 -include("requests.hrl").
 -include("game_okey.hrl").
 -include("game_tavla.hrl").

apps/server/src/nsg_games_app.erl

@@ -2,7 +2,6 @@
 -behaviour(application).
 -export([start/2, start/0, stop/0, stop/1]).
 -include_lib("eunit/include/eunit.hrl").
--include_lib("server/include/conf.hrl").
 
 start() -> start(init,[]).
 start(_StartType, _StartArgs) -> game_sup:start_link().

apps/server/src/nsg_trn_elimination.erl

@@ -21,7 +21,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/transaction.hrl").
@@ -457,7 +456,7 @@ handle_table_message(TableId, {response, RequestId, Response},
             handle_table_response(TableId, ReqContext, Response, StateName,
                                   StateData#state{tab_requests = NewTabRequests});
         error ->
-            ?ERROR("TRN_ELIMINATION <~p> Table <~p> sent a response for unknown request. "
+            gas:error(?MODULE,"TRN_ELIMINATION <~p> Table <~p> sent a response for unknown request. "
                    "RequestId: ~p. Response", []),
             {next_state, StateName, StateData#state{tab_requests = NewTabRequests}}
     end;

apps/server/src/nsg_trn_lucky.erl

@@ -21,7 +21,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/scoring.hrl").
@@ -402,7 +401,7 @@ handle_table_message(TableId, {response, RequestId, Response},
             handle_table_response(ReqContext, Response, ?STATE_PROCESSING,
                                   StateData#state{tab_requests = NewTabRequests});
         error ->
-            ?ERROR("TRN_LUCKY <~p> Table <~p> sent a response for unknown request. "
+            gas:error(?MODULE,"TRN_LUCKY <~p> Table <~p> sent a response for unknown request. "
                    "RequestId: ~p. Response", []),
             {next_state, ?STATE_PROCESSING, StateData#state{tab_requests = NewTabRequests}}
     end;

apps/server/src/nsg_trn_standalone.erl

@@ -21,7 +21,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/scoring.hrl").
@@ -346,7 +345,7 @@ code_change(_OldVsn, StateName, StateData, _Extra) ->
 
 
 handle_client_message(Message, StateName, #state{game_id = GameId} = StateData) ->
-    ?ERROR("TRN_STANDALONE <~p> Unhandled client message received in "
+    gas:error(?MODULE,"TRN_STANDALONE <~p> Unhandled client message received in "
            "state <~p>: ~p.", [GameId, StateName, Message]),
     {next_state, StateName, StateData}.
 
@@ -460,14 +459,14 @@ handle_table_message(TableId, {response, RequestId, Response},
             handle_table_response(TableId, ReqContext, Response, StateName,
                                   StateData#state{tab_requests = NewTabRequests});
         error ->
-            ?ERROR("TRN_STANDALONE <~p> Table <~p> sent a response for unknown request. "
+            gas:error(?MODULE,"TRN_STANDALONE <~p> Table <~p> sent a response for unknown request. "
                    "RequestId: ~p. Response", []),
             {next_state, StateName, StateData#state{tab_requests = NewTabRequests}}
     end;
 
 
 handle_table_message(TableId, Message, StateName, #state{game_id = GameId} = StateData) ->
-    ?ERROR("TRN_STANDALONE <~p> Unhandled table message received from table <~p> in "
+    gas:error(?MODULE,"TRN_STANDALONE <~p> Unhandled table message received from table <~p> in "
            "state <~p>: ~p.", [GameId, TableId, StateName, Message]),
     {next_state, StateName, StateData}.
 
@@ -510,7 +509,7 @@ handle_table_response(_TableId, {replace_player, PlayerId, TableId, SeatNum}, ok
 
 handle_table_response(TableId, RequestContext, Response, StateName,
                       #state{game_id = GameId} = StateData) ->
-    ?ERROR("TRN_STANDALONE <~p> Unhandled 'table response' received from table <~p> "
+    gas:error(?MODULE,"TRN_STANDALONE <~p> Unhandled 'table response' received from table <~p> "
            "in state <~p>. Request context: ~p. Response: ~p.",
            [GameId, TableId, StateName, RequestContext, Response]),
     {next_state, StateName, StateData}.
@@ -575,7 +574,7 @@ handle_client_request({join, UserInfo}, From, StateName,
     end;
 
 handle_client_request(Request, From, StateName, #state{game_id = GameId} = StateData) ->
-    ?ERROR("TRN_STANDALONE <~p> Unhandled client request received from ~p in "
+    gas:error(?MODULE,"TRN_STANDALONE <~p> Unhandled client request received from ~p in "
            "state <~p>: ~p.", [GameId, From, StateName, Request]),
     {reply, {error, unexpected_request}, StateName, StateData}.
 

apps/server/src/okey/game_okey_bot.erl

@@ -7,10 +7,8 @@
 -export([call_rpc/2]).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
--include_lib("server/include/conf.hrl").
 -include_lib("server/include/requests.hrl").
 -include_lib("server/include/game_okey.hrl").
--include_lib("server/include/log.hrl").
 
 -record(state, {
         is_robot = true :: boolean(),

apps/server/src/okey/game_okey_desk.erl

@@ -56,7 +56,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 
 %% --------------------------------------------------------------------
 %% External exports
@@ -404,7 +403,7 @@ handle_player_action(PlayerId, {reveal, Tash, TashPlaces}, ?STATE_DISCARD,
     end;
 
 handle_player_action(_PlayerId, _Action, _StateName, _StateData) ->
-    ?ERROR("OKEY_NG_DESK Invalid action passed. Player: ~p.~n Action: ~p. StateName: ~p.",
+    gas:error(?MODULE,"OKEY_NG_DESK Invalid action passed. Player: ~p.~n Action: ~p. StateName: ~p.",
            [_PlayerId, _Action, _StateName]),
     {error, invalid_action}.
 

apps/server/src/okey/game_okey_scoring.erl

@@ -8,7 +8,6 @@
 %% Include files
 %%
 -include_lib("eunit/include/eunit.hrl").
--include_lib("server/include/log.hrl").
 
 %%
 %% Exported Functions

apps/server/src/okey/game_okey_table.erl

@@ -10,7 +10,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("server/include/settings.hrl").
 -include_lib("server/include/game_okey.hrl").
@@ -399,7 +398,7 @@ handle_parent_message(stop, _StateName, StateData) ->
 
 handle_parent_message(Message, StateName,
                       #okey_state{game_id = GameId, table_id = TableId} = StateData) ->
-    ?ERROR("OKEY_NG_TABLE_TRN <~p,~p> Unexpected parent message received in state <~p>: ~p. State: ~p. Stopping.",
+    gas:error(?MODULE,"OKEY_NG_TABLE_TRN <~p,~p> Unexpected parent message received in state <~p>: ~p. State: ~p. Stopping.",
            [GameId, TableId, StateName, Message, StateName]),
     {stop, unexpected_parent_message, StateData}.
 
@@ -465,7 +464,7 @@ handle_relay_message({subscriber_added, PlayerId, SubscrId} = Msg, StateName,
     {next_state, StateName, StateData};
 
 handle_relay_message(Message, StateName, #okey_state{game_id = GameId, table_id = TableId} = StateData) ->
-    ?ERROR("OKEY_NG_TABLE_TRN <~p,~p> Unknown relay message received in state <~p>: ~p. State: ~p. Stopping.",
+    gas:error(?MODULE,"OKEY_NG_TABLE_TRN <~p,~p> Unknown relay message received in state <~p>: ~p. State: ~p. Stopping.",
            [GameId, TableId, StateName, Message]),
     {next_state, StateName, StateData}.
 

apps/server/src/okey/test_hands.erl

@@ -8,7 +8,6 @@
 
 -module(test_hands).
 
--include_lib("server/include/logging.hrl").
 -include_lib("server/include/requests.hrl").
 -include_lib("server/include/game_okey.hrl").
 
@@ -19,9 +18,9 @@
 
 -spec set_pieces(list() | undefined) -> ok.
 set_pieces(P) ->
-    ?PP("pieces ~p", [P]),
+    gas:info(?MODULE,"pieces ~p", [P]),
     A = kakaconfig:set([games, okey, debug_next_round_pieces], P),
-    ?PP("set result: ~p", [A]),
+    gas:info(?MODULE,"set result: ~p", [A]),
     ok.
 
 -spec clear() -> ok.
@@ -104,7 +103,7 @@ are_hands_proper_test() ->
     Ideal = lists:sort([A] ++ lists:flatten(LL1) ++ L2),
     Set1 = lists:sort(set_1()),
     Set2 = lists:sort(set_2()),
-    ?DP("~nIdeal -- Set1 = ~p~nSet1 -- Ideal = ~p~n", [Ideal -- Set1, Set1 -- Ideal]),
-    ?DP("~nIdeal -- Set2 = ~p~nSet2 -- Ideal = ~p~n", [Ideal -- Set2, Set2 -- Ideal]),
+    gas:info(?MODULE,"~nIdeal -- Set1 = ~p~nSet1 -- Ideal = ~p~n", [Ideal -- Set1, Set1 -- Ideal]),
+    gas:info(?MODULE,"~nIdeal -- Set2 = ~p~nSet2 -- Ideal = ~p~n", [Ideal -- Set2, Set2 -- Ideal]),
     true = Ideal == Set1,
     true = Ideal == Set2.

apps/server/src/okey/test_okey.erl

@@ -1,12 +1,8 @@
 -module(test_okey).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("server/include/log.hrl").
 -include_lib("server/include/settings.hrl").
--include_lib("server/include/conf.hrl").
--include_lib("server/include/kamf.hrl").
 -include_lib("server/include/requests.hrl").
--include_lib("server/include/classes.hrl").
 -include_lib("server/include/game_okey.hrl").
 
 %% debug
@@ -187,7 +183,7 @@ start_test_game_t(MultiOwner, CreateMode, RevealMode) ->
     process_flag(trap_exit, true),
     Ids = [<<"radistao">>,<<"paul">>,<<"kunthar">>,<<"gleber">>],
     Host = localhost,
-    Port = ?LISTEN_PORT,
+    Port = 9000,
     Owner = self(),
     Rematch = 0,
     case CreateMode of

apps/server/src/okey_sup.erl

@@ -1,8 +1,6 @@
 -module(okey_sup).
 -behaviour(supervisor).
 -export([start_link/0, stop/0]).
--include_lib("server/include/conf.hrl").
--include_lib("server/include/log.hrl").
 -export([init/1, start/0, start_game/3]).
 -define(SERVER, ?MODULE).
 

apps/server/src/relay_ng.erl

@@ -36,7 +36,6 @@
 %% Include files
 %% --------------------------------------------------------------------
 -include_lib("server/include/basic_types.hrl").
--include_lib("server/include/log.hrl").
 
 %% --------------------------------------------------------------------
 %% External exports

apps/server/src/tavla/game_tavla_bot.erl

@@ -6,8 +6,6 @@
 -export([start/3, start_link/3, robot_init/1, init_state/2, join_game/1, get_session/1,
          send_message/2, call_rpc/2, do_skip/2, do_rematch/1, first_move_table/0, follow_board/3 ]).
 
--include_lib("server/include/log.hrl").
--include_lib("server/include/conf.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("server/include/requests.hrl").
 -include_lib("server/include/game_tavla.hrl").

apps/server/src/tavla/game_tavla_ng_scoring.erl

@@ -4,7 +4,6 @@
 -module(game_tavla_ng_scoring).
 
 -include_lib("eunit/include/eunit.hrl").
--include_lib("server/include/log.hrl").
 
 %%
 %% Exported Functions

apps/server/src/tavla/game_tavla_ng_table.erl

@@ -10,7 +10,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("server/include/settings.hrl").
 -include_lib("server/include/game_tavla.hrl").
@@ -493,7 +492,7 @@ handle_parent_message({table_state_event, _PlayerId, SubscrId, StateEvent}, Stat
 
 handle_parent_message(Message, StateName,
                       #tavla_state{game_id = GameId, table_id = TableId} = StateData) ->
-    ?ERROR("TAVLA_NG_TABLE <~p,~p> Unexpected parent message received in state <~p>: ~p. Stopping.",
+    gas:error(?MODULE,"TAVLA_NG_TABLE <~p,~p> Unexpected parent message received in state <~p>: ~p. Stopping.",
            [GameId, TableId, StateName, Message]),
     {stop, unexpected_parent_message, StateData}.
 
@@ -561,7 +560,7 @@ handle_relay_message({subscriber_added, PlayerId, SubscrId} = Msg, StateName,
     {next_state, StateName, StateData};
 
 handle_relay_message(Message, StateName, #tavla_state{game_id = GameId, table_id = TableId} = StateData) ->
-    ?ERROR("TAVLA_NG_TABLE <~p,~p> Unknown relay message received in state <~p>: ~p. State: ~p. Stopping.",
+    gas:error(?MODULE,"TAVLA_NG_TABLE <~p,~p> Unknown relay message received in state <~p>: ~p. State: ~p. Stopping.",
            [GameId, TableId, StateName, Message]),
     {next_state, StateName, StateData}.
 

apps/server/src/tavla/game_tavla_ng_trn_paired.erl

@@ -21,7 +21,6 @@
 %% --------------------------------------------------------------------
 %% Include files
 %% --------------------------------------------------------------------
--include_lib("server/include/log.hrl").
 -include_lib("server/include/basic_types.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/transaction.hrl").
@@ -507,7 +506,7 @@ handle_table_message(TableId, {response, RequestId, Response},
             handle_table_response(TableId, ReqContext, Response, StateName,
                                   StateData#state{tab_requests = NewTabRequests});
         error ->
-            ?ERROR("TRN_PAIRED <~p> Table <~p> sent a response for unknown request. "
+            gas:error(?MODULE,"TRN_PAIRED <~p> Table <~p> sent a response for unknown request. "
                    "RequestId: ~p. Response", []),
             {next_state, StateName, StateData#state{tab_requests = NewTabRequests}}
     end;

apps/server/src/tavla/test_tavla.erl

@@ -1,11 +1,7 @@
 -module(test_tavla).
 -author('Maxim Sokhatsky <maxim@synrc.com').
 
--include_lib("server/include/conf.hrl").
--include_lib("server/include/log.hrl").
--include_lib("server/include/kamf.hrl").
 -include_lib("server/include/requests.hrl").
--include_lib("server/include/classes.hrl").
 -include_lib("server/include/game_tavla.hrl").
 -include_lib("server/include/settings.hrl").
 
@@ -41,7 +37,7 @@ start() ->
 fire_starter(MultiOwner, CreateMode, RevealMode) ->
     process_flag(trap_exit, true),
     Host = localhost,
-    Port = ?LISTEN_PORT,
+    Port = 9000,
     Owner = self(),
     Rematch = 1,
     case CreateMode of

apps/server/src/tavla_sup.erl

@@ -1,8 +1,6 @@
 -module(tavla_sup).
 -behaviour(supervisor).
 -export([start_link/0, stop/0]).
--include_lib("server/include/conf.hrl").
--include_lib("server/include/log.hrl").
 -export([init/1, start/0, start_game/3]).
 -define(SERVER, ?MODULE).