journal renaming. don't update online list while chatting

apps/db/include/game_log.hrl → apps/db/include/journal.hrl

@@ -1,5 +1,5 @@
--ifndef(GAME_LOG_HRL).
--define(GAME_LOG_HRL, "game_log.hrl").
+-ifndef(JOURNAL_HRL).
+-define(JOURNAL_HRL, "journal.hrl").
 
 -include_lib("kvs/include/kvs.hrl").
 -define(LOG_HEADER, game_id, date, time, user, module, type, speed, rounds).

apps/db/src/db_game_log.erl → apps/db/src/db_journal.erl

@@ -1,6 +1,6 @@
--module(db_game_log).
+-module(db_journal).
 -include_lib("kvs/include/metainfo.hrl").
--include_lib("db/include/game_log.hrl").
+-include_lib("db/include/journal.hrl").
 -compile(export_all).
 
 metainfo() ->

apps/server/src/README.md

@@ -87,7 +87,7 @@ Each tournaments and games are driven by supervisors. Also Game Server has game
 serices along with auth token sever which are also under supervision.
 
     ├── sup
-    │   ├── game_log.erl            persist game protocol statistics in KV store
+    │   ├── journal.erl             persist game protocol statistics in KV store
     │   ├── id_generator.erl        unique ids
     │   ├── lucky_sup.erl           lucky games supervisor
     │   ├── okey_sup.erl            okey pre-created games

apps/server/src/game.erl

@@ -2,7 +2,7 @@
 -author('Maxim Sokhatsky <maxim@synrc.com>').
 -compile(export_all).
 -include_lib("server/include/requests.hrl").
--include_lib("db/include/game_log.hrl").
+-include_lib("db/include/journal.hrl").
 -include_lib("db/include/table.hrl").
 -include_lib("db/include/tournaments.hrl").
 -include_lib("db/include/scoring.hrl").

apps/server/src/game_sup.erl

@@ -19,7 +19,7 @@ init([]) ->
     Shutdown = 2000,
     IdGen = {id_generator, {id_generator, start_link, []},  Restart, Shutdown, worker, [id_generator]},
     AuthServer = {auth_server, {auth_server, start_link, []}, Restart, Shutdown, worker, [auth_server]},
-    GameLog = {game_log, {game_log, start_link, []}, Restart, Shutdown, worker, [game_log]},
+    GameLog = {journal, {journal, start_link, []}, Restart, Shutdown, worker, [journal]},
     TavlaSup = {tavla_sup, {tavla_sup, start_link, []}, Restart, Shutdown, supervisor, [tavla_sup]},
     OkeySup = {okey_sup, {okey_sup, start_link, []}, Restart, Shutdown, supervisor, [okey_sup]},
     LuckySup = {lucky_sup, {lucky_sup, start_link, []}, Restart, Shutdown, supervisor, [lucky_sup]},

apps/server/src/lib/known_records.erl

@@ -1,7 +1,7 @@
 -module(known_records).
 
 -include("requests.hrl").
--include_lib("db/include/game_log.hrl"). 
+-include_lib("db/include/journal.hrl"). 
 -include("game_okey.hrl").
 -include("game_tavla.hrl").
 

apps/server/src/okey/okey_table.erl

@@ -15,7 +15,7 @@
 -include_lib("server/include/game_okey.hrl").
 -include_lib("server/include/game_state.hrl").
 -include_lib("server/include/requests.hrl").
--include_lib("db/include/game_log.hrl").
+-include_lib("db/include/journal.hrl").
 
 %% --------------------------------------------------------------------
 %% External exports
@@ -61,7 +61,7 @@
 -define(SEATS_NUM, 4).
 -define(RELAY, relay).
 -define(DESK, okey_desk).
--define(GAME_STATS, game_log).
+-define(GAME_STATS, journal).
 -define(SCORING, okey_scoring).
 
 %% ====================================================================

apps/server/src/sup/game_log.erl → apps/server/src/sup/journal.erl

@@ -1,7 +1,7 @@
--module(game_log).
+-module(journal).
 -behaviour(gen_server).
 -include_lib("kvs/include/kvs.hrl").
--include_lib("db/include/game_log.hrl").
+-include_lib("db/include/journal.hrl").
 -include_lib("server/include/game_state.hrl").
 -include_lib("server/include/requests.hrl").
 -compile(export_all).
@@ -40,7 +40,7 @@ handle_cast({protocol_event, UserId,
 
     Key = {GameKind,GameMode,Speed,Rounds,GameId},
 
-    EventLogEntry = 
+    ProtocolEvent = 
         #protocol_event{
            user = UserId,
            feed_id = Key,
@@ -54,12 +54,15 @@ handle_cast({protocol_event, UserId,
            event = EventName,
            game_event = Event},
 
-    try kvs:add(EventLogEntry)
+    gas:info(?MODULE, "ProtocolEvent: ~p", [ProtocolEvent]),
+
+    try kvs:add(ProtocolEvent)
     catch E:R ->
         gas:info(?MODULE,"kvs:add ERROR ~p",[{E,R}]),
-        gas:info(?MODULE, "Event Log: ~p", [EventLogEntry]),
+        gas:info(?MODULE, "Errored Protocol Event: ~p", [ProtocolEvent]),
         ok end,
-    update_container_stats(UserId, EventLogEntry,#protocol_event.event,GameState),
+
+    update_container_stats(UserId, ProtocolEvent,#protocol_event.event,GameState),
 
     {noreply, State};
 handle_cast({update_stats, User, Event, Pos, GameState}, State) ->

apps/web/priv/static/app/js/roster.js

@@ -17,7 +17,7 @@ function RosterHandlers(scope) {
         var msg = e.detail, id = msg[0], name = msg[1], surname = msg[2];
         if (null != document.getElementById(id)) removeOnlineUser(id);
         addOnlineUser(id,name+" "+surname,"insertTop");
-        showOnlineList();
+        if (currentChat == null) showOnlineList();
     });
 
     scope.apiProvider.on("offline", function (x) {
@@ -35,7 +35,7 @@ function RosterHandlers(scope) {
 
     scope.apiProvider.on("roster_end", function (x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
-        showOnlineList();
+        if (currentChat == null) showOnlineList();
     });
 
     scope.apiProvider.on("chat_message", function (x) {

apps/web/src/logallow.erl

@@ -7,7 +7,7 @@ log_modules() -> [
     game_session,
     bullet_handler,
     okey_scoring,
-    game_log,
+    journal,
 %    n2o_secret,
 %    js_session,
     okey