xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改环境变量使用

Browse Source
This commit is contained in:
luying
2020-12-28 20:31:04 +08:00
parent d507c7bf7f
commit afd850e69e
19 changed files with 599 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app.ts
+29 -30
View File
@@ -13,6 +13,7 @@ import './app/servers/user.rpc.define'
import * as routeUtil from './app/util/routeUtil';
import { preload } from './preload';
var checkEventFilter = require('./app/servers/battle/filter/checkEventFilter');
import { connectRedis } from './config/redis';
// TODO 需要整理。
import _pinus = require('pinus');
@@ -21,13 +22,7 @@ const filePath = (_pinus as any).FILEPATH;
filePath.MASTER = '/config/master';
filePath.SERVER = '/config/servers';
filePath.CRON = '/config/crons';
// if(process.env.NODE_ENV == 'local') {
filePath.LOG = '/config/log4js.local';
// } else if(process.env.NODE_ENV == 'prod'){
// filePath.LOG = '/config/log4js.prod';
// } else {
// filePath.LOG = '/config/log4js.prod';
// }
filePath.LOG = '/config/log4js';
filePath.SERVER_PROTOS = '/config/serverProtos';
filePath.CLIENT_PROTOS = '/config/clientProtos';
filePath.MASTER_HA = '/config/masterha';
@@ -45,32 +40,36 @@ adminfilePath.ADMIN_USER = 'config/adminUser';
*/
preload();
let mongoAddr = 'mongodb://dbop:zyzdbopbantu@dds-8vbdb47c6fb58a541.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdb47c6fb58a542.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-500808098';
if(process.env.NODE_ENV == 'local') {
mongoAddr = 'mongodb://127.0.0.1/zyz';
}
// 创建 mongodb 连接
mongoose.connect(mongoAddr, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true, useFindAndModify: false }, (err) => {
if (err) {
console.log('mongodb connect err', err);
} else {
console.log('mongodb connect suc');
}
});
/**
* Init app for client.
*/
let app = pinus.createApp();
app.set('name', 'chatofpomelo-websocket');
// TODO 重启 1 次只需要初始化 1 次，判断方法可以优化
if (app.serverId === 'master-server-1') {
redisService.initAllRank();
redisService.clearComBtlQueue();
}
// 加载数据库和redis
app.configure(function() {
app.loadConfig('database', app.getBase() + '/config/database');
mongoose.connect(app.get('database').mongo, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true, useFindAndModify: false }, (err) => {
if (err) {
console.log('mongodb connect err', err);
} else {
console.log('mongodb connect suc');
}
});
const redisClient = connectRedis(app.get('database').redis);
app.set('redis', redisClient);
// TODO 重启 1 次只需要初始化 1 次，判断方法可以优化
if (app.serverId === 'master-server-1') {
redisService.initAllRank();
redisService.clearComBtlQueue();
}
});
// app configuration
app.configure('production|development|local', 'connector', function () {
app.configure('production|development|alpha|dev', 'connector', function () {
app.set('connectorConfig',
{
connector: pinus.connectors.hybridconnector,
@@ -95,7 +94,7 @@ app.configure('production|development|local', 'connector', function () {
});
});
app.configure('production|development|local', 'gate', function () {
app.configure('production|development|alpha|dev', 'gate', function () {
app.set('connectorConfig',
{
connector: pinus.connectors.hybridconnector,
@@ -128,7 +127,7 @@ export function globalErrorHandler(err: Error, msg: any, resp: any,
}
// app configure
app.configure('production|development|local', function () {
app.configure('production|development|alpha|dev', function () {
app.set(RESERVED.ERROR_HANDLER, errorHandler);
app.set(RESERVED.GLOBAL_ERROR_HANDLER, globalErrorHandler);
app.globalAfter((err: Error, routeRecord: RouteRecord, msg: any, session: FrontendOrBackendSession, resp: any, cb: HandlerCallback) => {
@@ -169,7 +168,7 @@ app.configure('production|development|local', function () {
});
});
app.configure('development|local', function () {
app.configure('development', function () {
// enable the system monitor modules
app.enable('systemMonitor');
app.enable('rpcDebugLog');