diff --git a/game-server/app.ts b/game-server/app.ts index 77bae454c..28b20cc10 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -47,7 +47,7 @@ filePath.CONFIG_DIR = '/config'; const adminfilePath = _pinus.DEFAULT_ADMIN_PATH; adminfilePath.ADMIN_FILENAME = 'adminUser'; adminfilePath.ADMIN_USER = 'config/adminUser'; -const ALL_ENVS = 'stable|development|alpha|dev|isbn|monitor|distribute|sq1'; +const ALL_ENVS = 'stable|development|alpha|dev|isbn|monitor|monitor2|distribute|sq1'; /** * 替换全局Promise * 自动解析sourcemap diff --git a/game-server/config/database.ts b/game-server/config/database.ts index 7b3c437ec..016d4710d 100644 --- a/game-server/config/database.ts +++ b/game-server/config/database.ts @@ -36,6 +36,12 @@ module.exports = { 'redis': 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com', 'redispw': 'zyz_monitor_2021' }, + 'monitor2': { + 'mongo': 'mongodb://dbop:zyzDev2022@dds-8vbc0bc9420028041.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbc0bc9420028042.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-508590620', + 'gmmongo': 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', + 'redis': 'r-8vb418l8kkju9sis8k.redis.zhangbei.rds.aliyuncs.com', + 'redispw': 'zyz_dev_2021' + }, 'distribute': { 'mongo': 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5c74ba4263da42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-506991391', 'gmmongo': 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', diff --git a/game-server/config/master.ts b/game-server/config/master.ts index 84c24c9a9..560131c7c 100644 --- a/game-server/config/master.ts +++ b/game-server/config/master.ts @@ -34,6 +34,11 @@ module.exports = { 'host': '127.0.0.1', 'port': 3005 }, + 'monitor2': { + 'id': 'master-server-1', + 'host': '127.0.0.1', + 'port': 3005 + }, 'distribute': { 'id': 'master-server-1', 'host': '172.26.145.161', diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index 37c201db5..6ca3a01f2 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -238,6 +238,38 @@ module.exports = { { 'id': 'order-server-1', 'host': '127.0.0.1', 'port': 6060, "args": " --inspect=9242" }, ] }, + 'monitor2': { + 'connector': [ + { 'id': 'connector-server-1', 'port': 4050, 'clientHost': '8.142.30.128', 'host': '172.26.145.170', 'clientPort': 3050, 'frontend': true }, + ], + 'chat': [ + { 'id': 'chat-server-1', 'host': '172.26.145.170', 'port': 6050 }, + ], + 'role': [ + { 'id': 'role-server-1', 'host': '172.26.145.170', 'port': 6053 } + ], + 'battle': [ + { 'id': 'battle-server-1', 'host': '172.26.145.170', 'port': 6054 } + ], + 'gate': [ + { 'id': 'gate-server-1', 'host': '172.26.145.170', 'clientHost': '8.142.30.128', 'clientPort': 3014, 'frontend': true }, + ], + 'gm': [ + { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 } + ], + 'systimer': [ + { 'id': 'systimer-server-1', 'host': '172.26.145.170', 'port': 6056 } + ], + 'guild': [ + { 'id': 'guild-server-1', 'host': '172.26.145.170', 'port': 6057 }, + ], + 'activity': [ + { 'id': 'activity-server-1', 'host': '172.26.145.170', 'port': 6059 }, + ], + 'order': [ + { 'id': 'order-server-1', 'host': '172.26.145.170', 'port': 6060 }, + ] + }, 'distribute': { 'connector': [ { 'id': 'connector-server-4', 'host': '172.26.145.171', 'port': 9061, 'clientHost': '121.89.211.172', 'clientPort': 3050, 'frontend': true, "args": " --inspect=9237" }, diff --git a/game-server/xtransitConfig/zyz.js b/game-server/xtransitConfig/zyz.js index a5af73bb3..557ffcbb5 100644 --- a/game-server/xtransitConfig/zyz.js +++ b/game-server/xtransitConfig/zyz.js @@ -12,7 +12,7 @@ module.exports = { packages: [], // 数组,配置需要监控的项目依赖文件全路径 // III. 不是很重要的可选的配置 - logDir: './game-server/logs', // xprofiler 插件生成性能日志文件的目录,默认两者均为 os.tmpdir() + logDir: '/zyz_logs/xprofiler', // xprofiler 插件生成性能日志文件的目录,默认两者均为 os.tmpdir() docker: false, // 默认 false, 系统数据采集会依赖当前是否是 docker 环境而进行一些特殊处理,可以手动强制指定当前实例是否为 docker 环境 ipMode: false, // 默认 false,此时仅使用 hostname 作为 agentId;设置为 true 后 agentId 组装形式为 ${ip}_${hostname} libMode: false, // 默认 false,此时采集如果收到 shutdown 事件会退出当前进程;如果是以第三方库的形式引用接入应用内,请将此属性设置为 true diff --git a/pushdocker.sh b/pushdocker.sh index a2960a50e..2618bb695 100755 --- a/pushdocker.sh +++ b/pushdocker.sh @@ -23,6 +23,8 @@ elif [ ${1} == 'isbn' ] ; then destUrl="root@zyzisbn:/root/zyz/" elif [ ${1} == 'monitor' ] ; then destUrl="root@zyzmon:/root/zyz/" +elif [ ${1} == 'monitor2' ] ; then + destUrl="root@zyzmon2:/root/zyz/" elif [ ${1} == 'distribute' ] ; then destUrl="root@zyzdistribute:/root/zyz/" elif [ ${1} == 'sq1' ] ; then