Merge branch 'feature/docker' into feature/mysql

# Conflicts:
#	app.js
#	middleware/apm.js

@@ -4,4 +4,6 @@ node_modules/
 *.log
 .eslintcache
 .stylelintcache
-.vscode/
\ No newline at end of file
+.vscode/
+
+*.tar.gz

+############################################################
+# Dockerfile to build hystrix + turbin Installed Containers
+# Based on centos 6.7
+# How to build new image: docker build -t  yoho-hystrix-qcloud .
+# the hystrix alert need to post events to influxdb.yohoops.org.
+# nginx version: 1.12.0
+############################################################
+
+#base image ： ccr.ccs.tencentyun.com/yoho-base/nodejs
+FROM ccr.ccs.tencentyun.com/yoho-base/nodejs
+
+MAINTAINER  xiaoxiao.hao  <xiaoxiao.hao@yoho.cn>
+
+ENV NODE_ENV=production \
+    NODE_HOME=/home
+
+# COPY turbine configuration files
+COPY yoho-yohobuy-apm.tar.gz /home
+
+RUN cd /home && \
+    mkdir -p /home/yoho-yohobuy-apm && \
+    tar -xzvf yoho-yohobuy-apm.tar.gz -C /home/yoho-yohobuy-apm && \
+    rm -rf yoho-yohobuy-apm.tar.gz
+
+WORKDIR /home/yoho-yohobuy-apm
+
+#expose port
+EXPOSE 6009
+
+CMD ["node","/home/yoho-yohobuy-apm/app.js"]

@@ -18,9 +18,18 @@ app.use(bodyParser.text({limit: '1024kb'}));
 
 const middleware = require('./middleware');
 
-app.post('/write', middleware.serverApm);
+app.get('/', (req, res) => {
+    res.send('首页');
+});
+
+app.get('/apm/yas.gif', middleware.apm);
 
-app.get('/yas.gif', middleware.apm);
+// docker验证项目是否正常发布
+app.use('/node/status.html', (req, res) => {
+    return res.status(204).end();
+});
+
+app.post('/write', middleware.serverApm);
 
 app.use('*', (req, res) => {
     res.statusCode = 404;

@@ -18,17 +18,15 @@ module.exports = {
     domains: [/yohobuy\.com^/],
     loggers: {
         infoFile: {
-            close: true,
             name: 'info',
-            level: 'error',
-            filename: 'logs/info.log',
+            level: 'info',
+            filename: '/Data/log/yoho-yohobuy-apm/info.log',
             maxFiles: 7
         },
         errorFile: {
-            close: true,
             name: 'error',
             level: 'error',
-            filename: 'logs/error.log',
+            filename: '/Data/log/yoho-yohobuy-apm/error.log',
             handleExceptions: true,
             maxFiles: 7
         },

+#!/bin/bash
+wordir=$2
+cd $wordir
+rm -rf yoho-yohobuy-apm.tar.gz
+yarn
+tar -czvf yoho-yohobuy-apm.tar.gz *

@@ -33,7 +33,7 @@ module.exports = (req, res, next) => {
             return res.send();
         }
         report.forEach(item => {
-            if (item.pt.indexOf('openby:yohobuy') !== -1) {
+            if (item.pt && item.pt.indexOf('openby:yohobuy') !== -1) {
                 item.pt = item.pt.substring(0, item.pt.indexOf('openby:yohobuy'));
             }
 
@@ -82,8 +82,6 @@ module.exports = (req, res, next) => {
                         }, fields)
                     });
 
-                    console.log('====', JSON.stringify(data, null, '  '));
-
                     errorRouterSender.addMessage(msg2row.errorRouter(data));
                 });
             } else {