Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

pm2_server.json

@@ -2,12 +2,8 @@
   "apps": {
       "name": "constructionimport",
       "script": "server.js",
-      "args":"--max-old-space-size=2048",
-      "output": "/home/logs/out.log",
-      "error": "/home/logs/err.log",
-      "log_date_format": "YYYY-MM-DD HH:mm Z",
+      "node_args":"--max-old-space-size=2048",
       "exec_mode": "cluster_mode",                
-      "instances": 3, 
-      "merge_logs": true
+      "instances": 3
     }
 }