Authored by shuaiguo

Merge remote-tracking branch 'origin/hotfix/11' into hotfix/share

... ... @@ -92,8 +92,8 @@ module.exports = {
debugStdout: true
}
},
zookeeperServer: '127.0.0.1:2181',
jsSdk: '//cdn.yoho.cn/js-sdk/1.3.10/jssdk.js',
zookeeperServer: '127.0.0.1:2181',
redis: {
connect: {
host: '192.168.102.49',
... ... @@ -226,12 +226,6 @@ if (isProduction) {
service: process.env.TEST_API || 'http://api-test3.dev.yohocorp.com/'
},
useCache: true,
monitorReport: {
host: '192.168.102.22',
port: 8086,
db: 'web_monitor',
},
zookeeperServer: 'zk01-yohoops-org:2181',
loggers: {
infoFile: {
name: 'info',
... ... @@ -263,6 +257,38 @@ if (isProduction) {
prettyPrint: true,
debugStdout: true
}
},
zookeeperServer: 'zk.yohoops.com:2181',
monitorReport: {
// influxdb
host: 'influxdb.yohoops.com',
port: 8086,
db: 'web_monitor',
},
redis: {
connect: {
host: 'redis.yohoops.com',
port: '6379',
enable_offline_queue: false,
retry_strategy(options) {
if (options.error && options.error.code === 'ECONNREFUSED') {
console.log('connect redis server fail');
}
if (options.attempt < 10) {
return Math.min(options.attempt * 100, 1000);
} else if (options.attempt > 10 && options.attempt < 100) {
return 1000;
} else {
return 1000 * 10;
}
}
},
session: {
host: 'redis.yohoops.com',
port: '6379',
prefix: 'yohobuy_session:'
}
}
});
}
... ...