Merge remote-tracking branch 'origin/hotfix/11' into hotfix/share
Showing
1 changed file
with
33 additions
and
7 deletions
@@ -92,8 +92,8 @@ module.exports = { | @@ -92,8 +92,8 @@ module.exports = { | ||
92 | debugStdout: true | 92 | debugStdout: true |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | - zookeeperServer: '127.0.0.1:2181', | ||
96 | jsSdk: '//cdn.yoho.cn/js-sdk/1.3.10/jssdk.js', | 95 | jsSdk: '//cdn.yoho.cn/js-sdk/1.3.10/jssdk.js', |
96 | + zookeeperServer: '127.0.0.1:2181', | ||
97 | redis: { | 97 | redis: { |
98 | connect: { | 98 | connect: { |
99 | host: '192.168.102.49', | 99 | host: '192.168.102.49', |
@@ -226,12 +226,6 @@ if (isProduction) { | @@ -226,12 +226,6 @@ if (isProduction) { | ||
226 | service: process.env.TEST_API || 'http://api-test3.dev.yohocorp.com/' | 226 | service: process.env.TEST_API || 'http://api-test3.dev.yohocorp.com/' |
227 | }, | 227 | }, |
228 | useCache: true, | 228 | useCache: true, |
229 | - monitorReport: { | ||
230 | - host: '192.168.102.22', | ||
231 | - port: 8086, | ||
232 | - db: 'web_monitor', | ||
233 | - }, | ||
234 | - zookeeperServer: 'zk01-yohoops-org:2181', | ||
235 | loggers: { | 229 | loggers: { |
236 | infoFile: { | 230 | infoFile: { |
237 | name: 'info', | 231 | name: 'info', |
@@ -263,6 +257,38 @@ if (isProduction) { | @@ -263,6 +257,38 @@ if (isProduction) { | ||
263 | prettyPrint: true, | 257 | prettyPrint: true, |
264 | debugStdout: true | 258 | debugStdout: true |
265 | } | 259 | } |
260 | + }, | ||
261 | + zookeeperServer: 'zk.yohoops.com:2181', | ||
262 | + monitorReport: { | ||
263 | + // influxdb | ||
264 | + host: 'influxdb.yohoops.com', | ||
265 | + port: 8086, | ||
266 | + db: 'web_monitor', | ||
267 | + }, | ||
268 | + redis: { | ||
269 | + connect: { | ||
270 | + host: 'redis.yohoops.com', | ||
271 | + port: '6379', | ||
272 | + enable_offline_queue: false, | ||
273 | + retry_strategy(options) { | ||
274 | + if (options.error && options.error.code === 'ECONNREFUSED') { | ||
275 | + console.log('connect redis server fail'); | ||
276 | + } | ||
277 | + | ||
278 | + if (options.attempt < 10) { | ||
279 | + return Math.min(options.attempt * 100, 1000); | ||
280 | + } else if (options.attempt > 10 && options.attempt < 100) { | ||
281 | + return 1000; | ||
282 | + } else { | ||
283 | + return 1000 * 10; | ||
284 | + } | ||
285 | + } | ||
286 | + }, | ||
287 | + session: { | ||
288 | + host: 'redis.yohoops.com', | ||
289 | + port: '6379', | ||
290 | + prefix: 'yohobuy_session:' | ||
291 | + } | ||
266 | } | 292 | } |
267 | }); | 293 | }); |
268 | } | 294 | } |
-
Please register or login to post a comment