fe / yohobuywap-node · Commits

Go to a project

Authored by 徐炜
Commit 52da34d0d6ba36603d190f689e1b0246ae3431ff 2 parents 78b3b420 cecc936c

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 4 changed files with 9 additions and 27 deletions
@@ -7,11 +7,6 @@ @@ -7,11 +7,6 @@
7 7
8 const config = require('./config/common'); 8 const config = require('./config/common');
9 9
10 -// use one apm  
11 -if (config.useOneapm) {  
12 - require('oneapm');  
13 -}  
14 -  
15 const express = require('express'); 10 const express = require('express');
16 const path = require('path'); 11 const path = require('path');
17 const bodyParser = require('body-parser'); 12 const bodyParser = require('body-parser');
@@ -28,12 +28,11 @@ module.exports = { @@ -28,12 +28,11 @@ module.exports = {
28 activity: '//activity.yohobuy.com', 28 activity: '//activity.yohobuy.com',
29 index: '//m.yohobuy.com' 29 index: '//m.yohobuy.com'
30 }, 30 },
31 - useOneapm: false,  
32 useCache: false, 31 useCache: false,
33 memcache: { 32 memcache: {
34 - master: ['192.168.102.205:12111'],  
35 - slave: ['192.168.102.205:12111'],  
36 - session: ['192.168.102.205:12111'], 33 + master: ['192.168.102.168:12111'],
  34 + slave: ['192.168.102.168:12111'],
  35 + session: ['192.168.102.168:12111'],
37 timeout: 1000, 36 timeout: 1000,
38 retries: 0 37 retries: 0
39 }, 38 },
@@ -79,16 +78,15 @@ if (isProduction) { @@ -79,16 +78,15 @@ if (isProduction) {
79 domains: { 78 domains: {
80 api: 'http://api.yoho.yohoops.org/', 79 api: 'http://api.yoho.yohoops.org/',
81 service: 'http://service.yoho.yohoops.org/', 80 service: 'http://service.yoho.yohoops.org/',
82 - liveApi: 'http://preapi.live.yoho.cn/' // 'http://api.live.yoho.cn/' 81 + liveApi: 'http://api.live.yoho.cn/'
83 }, 82 },
84 memcache: { 83 memcache: {
85 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 84 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
86 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'], 85 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
87 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 86 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
88 - timeout: 1000, 87 + timeout: 100,
89 retries: 0 88 retries: 0
90 }, 89 },
91 - useOneapm: true,  
92 useCache: true, 90 useCache: true,
93 interfaceShunt: { 91 interfaceShunt: {
94 open: false, 92 open: false,
@@ -99,18 +97,17 @@ if (isProduction) { @@ -99,18 +97,17 @@ if (isProduction) {
99 Object.assign(module.exports, { 97 Object.assign(module.exports, {
100 appName: 'm.yohobuy.com for test', 98 appName: 'm.yohobuy.com for test',
101 domains: { 99 domains: {
102 - api: 'http://api-test3.yohops.com:9999/',  
103 - service: 'http://service-test3.yohops.com:9999/',  
104 - liveApi: 'http://testapi.live.yohops.com:9999/' 100 + api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
  101 + service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
  102 + liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
105 }, 103 },
106 memcache: { 104 memcache: {
107 master: ['127.0.0.1:12111'], 105 master: ['127.0.0.1:12111'],
108 slave: ['127.0.0.1:12112'], 106 slave: ['127.0.0.1:12112'],
109 session: ['127.0.0.1:12111'], 107 session: ['127.0.0.1:12111'],
110 - timeout: 1000, 108 + timeout: 100,
111 retries: 0 109 retries: 0
112 }, 110 },
113 - useOneapm: true,  
114 useCache: true 111 useCache: true
115 }); 112 });
116 } 113 }
@@ -44,7 +44,6 @@ @@ -44,7 +44,6 @@
44 "memcached": "^2.2.1", 44 "memcached": "^2.2.1",
45 "moment": "^2.14.1", 45 "moment": "^2.14.1",
46 "morgan": "^1.7.0", 46 "morgan": "^1.7.0",
47 - "oneapm": "^1.2.20",  
48 "passport": "^0.3.2", 47 "passport": "^0.3.2",
49 "passport-local": "^1.0.0", 48 "passport-local": "^1.0.0",
50 "passport-qq": "0.0.3", 49 "passport-qq": "0.0.3",
1 -#!/bin/bash  
2 -lsbom -f -l -s -pf /var/db/receipts/org.nodejs.pkg.bom \  
3 -| while read i; do  
4 - sudo rm /usr/local/${i}  
5 -done  
6 -sudo rm -rf /usr/local/lib/node \  
7 - /usr/local/lib/node_modules \  
8 - /var/db/receipts/org.nodejs.*  
9 -