From b5ca618cefe3805459fb1bf29210ba216bd7ae55 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 4 Jan 2022 19:33:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=9A=E4=BF=AE=E6=94=B9ho?= =?UTF-8?q?st=E4=B8=BA=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app.ts | 19 ++- game-server/app/services/redisService.ts | 2 +- game-server/config/servers.ts | 12 +- game-server/config/sq1/log4js.ts | 164 +++++++++++++++++++++++ gm-server/config/config.default.ts | 2 +- 5 files changed, 190 insertions(+), 9 deletions(-) create mode 100644 game-server/config/sq1/log4js.ts diff --git a/game-server/app.ts b/game-server/app.ts index 8d01ed0f6..7b7b03331 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -30,6 +30,7 @@ import { resResult, genCode } from './app/pubUtils/util'; import { errlogger, infologger } from './app/util/logger'; import { connectThinkingData, getTire } from './app/services/sdkService'; import { loadGmDb } from './app/db'; +const fs = require('fs'); const filePath = (_pinus as any).FILEPATH; filePath.MASTER = '/config/master'; @@ -112,6 +113,22 @@ app.configure(ALL_ENVS, 'connector', function () { }); }); +// wss加密 +// app.configure('sq1', 'connector', function() { +// app.set('connectorConfig', +// { +// connector: pinus.connectors.hybridconnector, +// heartbeat: 60, +// useDict: true, +// useProtobuf: true, +// ssl: { +// type: 'wss', +// key: fs.readFileSync('/usr/local/nginx/conf/cert/*.37wan.com.key'), +// cert: fs.readFileSync('/usr/local/nginx/conf/cert/*.37wan.com_with_chain.crt'), +// } +// }); +// }); + app.configure(ALL_ENVS, 'gate', function () { app.set('connectorConfig', { @@ -236,7 +253,7 @@ if (app.isMaster()) { app.event.on('add_servers', (server) => { - if(server.isGM != 'true') { + if(server.id != 'connector-server-gm') { redisService.setConnectors(server); } }) diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts index 25a74c4a1..fcea8a51f 100644 --- a/game-server/app/services/redisService.ts +++ b/game-server/app/services/redisService.ts @@ -476,7 +476,7 @@ export async function checkConnectors() { let redisServers = await redisClient().hgetallAsync(REDIS_KEY.SYS_SERVER); for(let id in redisServers) { let server = servers.find(cur => cur.id == id); - if(!server || server['isGM'] == 'true') { + if(!server || server.id == 'connector-server-gm') { await redisClient().hdelAsync(REDIS_KEY.SYS_SERVER, id); } } diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index ae1844dc7..ef5ee3965 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -247,9 +247,9 @@ module.exports = { }, 'sq1': { 'connector': [ - { 'id': 'connector-server-1', 'port': 4050, 'clientHost': '8.142.77.11', 'host': '172.16.4.108', 'clientPort': 3050, 'frontend': true }, - { 'id': 'connector-server-2', 'port': 4051, 'clientHost': '8.142.77.11', 'host': '172.16.4.108', 'clientPort': 3051, 'frontend': true }, - { 'id': 'connector-server-3', 'port': 4052, 'clientHost': '8.142.77.11', 'host': '172.16.4.108', 'clientPort': 3052, 'frontend': true }, + { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3050, 'frontend': true }, + { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3051, 'frontend': true }, + { 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3052, 'frontend': true }, ], 'chat': [ { 'id': 'chat-server-1', 'host': '172.16.4.108', 'port': 6050 }, @@ -263,8 +263,8 @@ module.exports = { { 'id': 'battle-server-1', 'host': '172.16.4.108', 'port': 6054 } ], 'gate': [ - { 'id': 'gate-server-1', 'host': '172.16.4.108', 'clientHost': '8.142.77.11', 'clientPort': 3014, 'frontend': true }, - { 'id': 'gate-server-2', 'host': '172.16.4.108', 'clientHost': '8.142.77.11', 'clientPort': 3015, 'frontend': true } + { 'id': 'gate-server-1', 'host': '172.16.4.108', 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'clientPort': 3014, 'frontend': true }, + { 'id': 'gate-server-2', 'host': '172.16.4.108', 'clientHost': 'sq1-game1-sgzyz.37wan.com', 'clientPort': 3015, 'frontend': true } ], 'gm': [ { 'id': 'gm-server-1', 'host': '172.16.4.108', 'port': 6055 } @@ -285,7 +285,7 @@ module.exports = { }, 'sq2': { 'connector': [ - { 'id': 'connector-server-gm', 'port': 4099, 'clientHost': '39.103.207.209', 'host': '172.16.4.108', 'clientPort': 3099, 'frontend': true, 'isGM': true } + { 'id': 'connector-server-gm', 'port': 4099, 'clientHost': 'gm-sgzyz.37wan.com', 'host': '172.16.4.108', 'clientPort': 3099, 'frontend': true, 'isGM': 'true' } ], }, }; diff --git a/game-server/config/sq1/log4js.ts b/game-server/config/sq1/log4js.ts new file mode 100644 index 000000000..ad1f7209e --- /dev/null +++ b/game-server/config/sq1/log4js.ts @@ -0,0 +1,164 @@ +module.exports = { + 'appenders': { + 'console': { + 'type': 'console' + }, + 'con-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/con-log-${opts:serverId}.log', + 'pattern': 'connector', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'rpc-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/rpc-log-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'forward-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/forward-log-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'rpc-debug': { + 'type': 'file', + 'filename': '${opts:base}/logs/rpc-debug-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'crash-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/crash.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'admin-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/admin.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus-admin': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-admin.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus-rpc': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-rpc-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'app': { + 'type': 'file', + 'filename': '${opts:base}/../logs/app/app.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'error': { + 'type': 'file', + 'filename': '${opts:base}/../logs/app/error.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + } + }, + + 'categories': { + 'default': { + 'appenders': ['console'], + 'level': 'debug' + }, + 'con-log': { + 'appenders': ['con-log'], + 'level': 'debug' + }, + 'rpc-log': { + 'appenders': ['rpc-log'], + 'level': 'debug' + }, + 'forward-log': { + 'appenders': ['forward-log'], + 'level': 'debug' + }, + 'rpc-debug': { + 'appenders': ['rpc-debug'], + 'level': 'debug' + }, + 'crash-log': { + 'appenders': ['crash-log'], + 'level': 'debug' + }, + 'admin-log': { + 'appenders': ['admin-log'], + 'level': 'debug' + }, + 'pinus-admin': { + 'appenders': ['pinus-admin'], + 'level': 'debug' + }, + 'pinus-rpc': { + 'appenders': ['pinus-rpc'], + 'level': 'debug' + }, + 'pinus': { + 'appenders': ['console'], + 'level': 'debug' + }, + 'info': { + 'appenders': ['console', 'app'], + 'level': 'debug' + }, + 'err': { + 'appenders': ['console', 'error'], + 'level': 'debug' + } + + }, + + 'prefix': '${opts:serverId} ', + 'replaceConsole': true, + 'lineDebug': false, + 'errorStack': true +}; diff --git a/gm-server/config/config.default.ts b/gm-server/config/config.default.ts index d7dbc62d2..68805e812 100644 --- a/gm-server/config/config.default.ts +++ b/gm-server/config/config.default.ts @@ -81,7 +81,7 @@ export default (appInfo: EggAppInfo) => { { env: 'alpha', name: "测试服", domain: 'http://pinus_gm_test.trgame.cn' }, { env: 'dev', name: "开发服", domain: 'http://zyzdev_gm.trgame.cn' }, // 37测试服组 - { env: 'sq1', name: "37测试1服", domain: 'http://39.103.207.209:7500' }, + { env: 'sq1', name: "37测试1服", domain: 'http://gm-sgzyz.37wan.com' }, ]; config.regions = regions;