Skip to content

Commit

Permalink
Merge pull request #35 from pwnsky/dev
Browse files Browse the repository at this point in the history 
Node Scale surrported
  • Loading branch information
@i0gan
i0gan authored Mar 31, 2024
2 parents 10a833f + 06269da commit acecf0b
Show file tree
Hide file tree
Showing 97 changed files with 1,090 additions and 1,442 deletions.
12 changes: 6 additions & 6 deletions config/log/db_proxy.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/db_proxy_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/db_proxy_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/db_proxy_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/db_proxy_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/db_proxy_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/db_proxy_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/db_proxy_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_fatal_%datetime{%Y%M%d}.log"
12 changes: 6 additions & 6 deletions config/log/default.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/default_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/default_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/default_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/default_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/default_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/default_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/default_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_fatal_%datetime{%Y%M%d}.log"
12 changes: 6 additions & 6 deletions config/log/game.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/game_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/game_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/game_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/game_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/game_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_fatal_%datetime{%Y%M%d}.log"
12 changes: 6 additions & 6 deletions config/log/game_mgr.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/gameplay_manager_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/gameplay_manager_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/gameplay_manager_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/game_mgr_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/gameplay_manager_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/gameplay_manager_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/gameplay_manager_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_fatal_%datetime{%Y%M%d}.log"
2 changes: 1 addition & 1 deletion config/log/lobby.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
FILENAME = "../data/logs/lobby_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/llobby_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/lobby_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/lobby_debug_%datetime{%Y%M%d}.log"
Expand Down
12 changes: 6 additions & 6 deletions config/log/master.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/master_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/master_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/master_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/master_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/master_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/master_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/master_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_fatal_%datetime{%Y%M%d}.log"
12 changes: 6 additions & 6 deletions config/log/proxy.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/proxy_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/proxy_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/proxy_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/proxy_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/proxy_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/proxy_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/proxy_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_fatal_%datetime{%Y%M%d}.log"
33 changes: 0 additions & 33 deletions config/log/tester.conf
View file

This file was deleted.

33 changes: 0 additions & 33 deletions config/log/tutorial.conf
View file

This file was deleted.

12 changes: 6 additions & 6 deletions config/log/world.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
MILLISECONDS_WIDTH = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 2097152 2MB / 209715200 200MB / 4398046511104 1GB
FILENAME = "../data/logs/world_server_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_global_%datetime{%Y%M%d}.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/world_server_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_info_%datetime{%Y%M%d}.log"
ENABLED = true
* DEBUG:
FILENAME = "./data/logs/world_server_debug_%datetime{%Y%M%d}.log"
FILENAME = "./data/logs/world_debug_%datetime{%Y%M%d}.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/world_server_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_warn_%datetime{%Y%M%d}.log"
ENABLED = true
* TRACE:

Expand All @@ -26,8 +26,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/world_server_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_error_%datetime{%Y%M%d}.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/world_server_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_fatal_%datetime{%Y%M%d}.log"
24 changes: 24 additions & 0 deletions config/node/global.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DB" : {
"Mysql" : {
"Account" : [
{ "ip":"127.0.0.1", "port":10400, "user":"root", "auth":"pwnsky_squick", "database":"player"}
]
},
"Mongo" : {
"Player" : [
{ "ip":"127.0.0.1", "port":10410, "user":"admin", "auth":"pwnsky_squick", "database":"game"}
]
},
"Redis" : {
"Cache" : [
{ "ip":"127.0.0.1", "port":10420, "user":"root", "auth":"pwnsky_squick", "database":""}
]
},
"Clickhouse" : {
"Log" : [
{ "ip":"127.0.0.1", "port":10431, "user":"default", "auth":"pwnsky_squick", "database":"squick"}
]
}
}
}
1 change: 0 additions & 1 deletion config/plugin/db_proxy.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<XML>
<DbProxy>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />

<Plugin Name="node/db_proxy/node" />
Expand Down
1 change: 0 additions & 1 deletion config/plugin/game.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<XML>
<Game>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />

<Plugin Name="node/game/node" />
Expand Down
1 change: 0 additions & 1 deletion config/plugin/game_mgr.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<XML>
<GameMgr>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />

<Plugin Name="node/game_mgr/node" />
Expand Down
4 changes: 0 additions & 4 deletions config/plugin/login.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<XML>
<Login>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />
<Plugin Name="core/redis" />

<Plugin Name="node/login/node" />
<Plugin Name="node/login/logic" />
<Plugin Name="node/login/http" />
<Plugin Name="node/login/redis" />
<Plugin Name="node/login/mysql" />
</Login>

</XML>
1 change: 0 additions & 1 deletion config/plugin/master.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<XML>
<Master>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />

<Plugin Name="node/master/logic" />
Expand Down
2 changes: 1 addition & 1 deletion config/plugin/proxy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Proxy>
<Plugin Name="core/net" />
<Plugin Name="core/config" />
<Plugin Name="core/log" />
<Plugin Name="core/log" />
<Plugin Name="core/world" />

<Plugin Name="node/proxy/logic" />
Expand Down
Loading

0 comments on commit acecf0b

Please sign in to comment.