Skip to content

Commit

Permalink
Merge pull request #55 from pwnsky/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
i0gan authored Aug 10, 2024
2 parents 9745439 + 67d74e6 commit bf95eec
Show file tree
Hide file tree
Showing 82 changed files with 889 additions and 219 deletions.
12 changes: 6 additions & 6 deletions config/log/backstage.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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/backstage_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/backstage_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/backstage_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/backstage_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/backstage_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/backstage_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/backstage_fatal.log"
12 changes: 6 additions & 6 deletions config/log/db_proxy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/db_proxy_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/db_proxy_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/db_proxy_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/db_proxy_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/db_proxy_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/db_proxy_fatal.log"
12 changes: 6 additions & 6 deletions config/log/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/default_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/default_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/default_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/default_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/default_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/default_fatal.log"
12 changes: 6 additions & 6 deletions config/log/game.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/game_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/game_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/game_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_fatal.log"
12 changes: 6 additions & 6 deletions config/log/game_mgr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_mgr_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/game_mgr_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/game_mgr_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/game_mgr_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_mgr_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/game_mgr_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/game_mgr_fatal.log"
12 changes: 6 additions & 6 deletions config/log/master.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/master_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/master_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/master_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/master_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/master_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/master_fatal.log"
12 changes: 6 additions & 6 deletions config/log/player.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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/player_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/player_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/player_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/player_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/player_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/player_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/player_fatal.log"
12 changes: 6 additions & 6 deletions config/log/proxy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/proxy_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/proxy_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/proxy_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/proxy_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/proxy_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/proxy_fatal.log"
12 changes: 6 additions & 6 deletions config/log/web.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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/web_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/web_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/web_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/web_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/web_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/web_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/web_fatal.log"
12 changes: 6 additions & 6 deletions config/log/world.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
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_global_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_global.log"
* INFO:
LOG_FLUSH_THRESHOLD = 10
FILENAME = "../data/logs/world_info_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_info.log"
ENABLED = true
* DEBUG:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/world_debug_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_debug.log"
ENABLED = true
* WARNING:
LOG_FLUSH_THRESHOLD = 0
FILENAME = "../data/logs/world_warn_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_warn.log"
ENABLED = true
* TRACE:

Expand All @@ -27,8 +27,8 @@
* ERROR:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/world_error_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_error.log"
* FATAL:
LOG_FLUSH_THRESHOLD = 0
ENABLED = true
FILENAME = "../data/logs/world_fatal_%datetime{%Y%M%d}.log"
FILENAME = "../data/logs/world_fatal.log"
15 changes: 15 additions & 0 deletions config/node/backstage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"ResponseHttpHeader": {
"Access-Control-Allow-Origin" : "http://localhost:5173",
"Access-Control-Allow-Headers" : "Content-Type,Access-Token,X-CSRF-Token, Authorization",
"Access-Control-Allow-Methods" : "POST,GET,OPTIONS,PUT",
"Access-Control-Expose-Headers" : "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type",
"Access-Control-Allow-Credentials" : "true"
},

"WhiteUriList" : [
"/api/login",
"/api/reload",
"/api/execute_lua"
]
}
12 changes: 12 additions & 0 deletions config/node/base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"is_online_version" : false,
"protocol_debug": true,
"protocol_timeout_check": true,
"coroutine_max_num" : 10000,
"is_enable_https": false,
"max_connection": 10000,
"ssl_file" : {
"certificate" : "../config/ssl/certificate.pem",
"private_key" : "../config/ssl/private-key.pem"
}
}
10 changes: 5 additions & 5 deletions config/node/db.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"Mysql" : {
"Account" : { "ip":"127.0.0.1", "port":10400, "user":"root", "password":"pwnsky_squick", "database":"db_account"}
"Account" : { "ip":"9.134.247.53", "port":10400, "user":"root", "password":"pwnsky_squick", "database":"db_account" }
},
"Mongo" : {
"Player" : { "ip":"127.0.0.1", "port":10410, "user":"admin", "password":"pwnsky_squick", "database":"db_game"}
"Player" : { "ip":"9.134.247.53", "port":10410, "user":"admin", "password":"pwnsky_squick", "database":"db_game"}
},
"Redis" : {
"Cache" : { "ip":"127.0.0.1", "port":10420, "user":"root", "password":"pwnsky_squick", "database":""}
"Cache" : { "ip":"9.134.247.53", "port":10420, "user":"root", "password":"pwnsky_squick", "database":""}
},
"Clickhouse" : {
"Log" : { "ip":"127.0.0.1", "port":10431, "user":"default", "password":"pwnsky_squick", "database":"db_log"}
"Log" : { "ip":"9.134.247.53", "port":10431, "user":"default", "password":"pwnsky_squick", "database":"db_log"}
}
}
}
Loading

0 comments on commit bf95eec

Please sign in to comment.