fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit 2912cffaf96b40421402734dafe71fb9e94934d0 2 parents 78770172 cecc936c

Merge branch 'master' into release/5.0.0

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');
@@ -32,12 +32,11 @@ module.exports = { @@ -32,12 +32,11 @@ module.exports = {
32 activity: '//activity.yohobuy.com', 32 activity: '//activity.yohobuy.com',
33 index: '//m.yohobuy.com' 33 index: '//m.yohobuy.com'
34 }, 34 },
35 - useOneapm: false,  
36 useCache: false, 35 useCache: false,
37 memcache: { 36 memcache: {
38 - master: ['192.168.102.205:12111'],  
39 - slave: ['192.168.102.205:12111'],  
40 - session: ['192.168.102.205:12111'], 37 + master: ['192.168.102.168:12111'],
  38 + slave: ['192.168.102.168:12111'],
  39 + session: ['192.168.102.168:12111'],
41 timeout: 1000, 40 timeout: 1000,
42 retries: 0 41 retries: 0
43 }, 42 },
@@ -83,16 +82,15 @@ if (isProduction) { @@ -83,16 +82,15 @@ if (isProduction) {
83 domains: { 82 domains: {
84 api: 'http://api.yoho.yohoops.org/', 83 api: 'http://api.yoho.yohoops.org/',
85 service: 'http://service.yoho.yohoops.org/', 84 service: 'http://service.yoho.yohoops.org/',
86 - liveApi: 'http://preapi.live.yoho.cn/' // 'http://api.live.yoho.cn/' 85 + liveApi: 'http://api.live.yoho.cn/'
87 }, 86 },
88 memcache: { 87 memcache: {
89 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 88 master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
90 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'], 89 slave: ['memcache1.yohoops.org:12112', 'memcache2.yohoops.org:12112', 'memcache3.yohoops.org:12112'],
91 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'], 90 session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
92 - timeout: 1000, 91 + timeout: 100,
93 retries: 0 92 retries: 0
94 }, 93 },
95 - useOneapm: true,  
96 useCache: true, 94 useCache: true,
97 interfaceShunt: { 95 interfaceShunt: {
98 open: false, 96 open: false,
@@ -103,18 +101,17 @@ if (isProduction) { @@ -103,18 +101,17 @@ if (isProduction) {
103 Object.assign(module.exports, { 101 Object.assign(module.exports, {
104 appName: 'm.yohobuy.com for test', 102 appName: 'm.yohobuy.com for test',
105 domains: { 103 domains: {
106 - api: 'http://api-test3.yohops.com:9999/',  
107 - service: 'http://service-test3.yohops.com:9999/',  
108 - liveApi: 'http://testapi.live.yohops.com:9999/' 104 + api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
  105 + service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
  106 + liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/'
109 }, 107 },
110 memcache: { 108 memcache: {
111 master: ['127.0.0.1:12111'], 109 master: ['127.0.0.1:12111'],
112 slave: ['127.0.0.1:12112'], 110 slave: ['127.0.0.1:12112'],
113 session: ['127.0.0.1:12111'], 111 session: ['127.0.0.1:12111'],
114 - timeout: 1000, 112 + timeout: 100,
115 retries: 0 113 retries: 0
116 }, 114 },
117 - useOneapm: true,  
118 useCache: true 115 useCache: true
119 }); 116 });
120 } 117 }
@@ -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 -