Bladeren bron

测试pm2 logs bugs

zhangweicheng 5 jaren geleden
bovenliggende
commit
db0ce2d5c0
4 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 1 1
      importserver.js
  2. 1 1
      package.json
  3. 3 2
      pm2.json
  4. 1 0
      web/building_saas/pm/js/pm_newMain.js

+ 1 - 1
importserver.js

@@ -6,7 +6,7 @@ let express = require('express');
 let config = require("./config/config.js");
 let fileUtils = require("./modules/common/fileUtils");
 let dbm = require("./config/db/db_manager");
-let log = require("./logs/log_helper");
+//let log = require("./logs/log_helper");
 
 config.setupDb(process.env.NODE_ENV);
 

+ 1 - 1
package.json

@@ -65,7 +65,7 @@
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd server.js",
     "server": "node --max-old-space-size=2048 server.js",
     "socket": "node socket.js",
-    "import": "pm2-docker importserver.js -i 3",
+    "import": "pm2-docker pm2.json",
     "dev_server": "SET NODE_ENV=qa&& babel-node server.js",
     "dev_socket": "SET NODE_ENV=qa&& babel-node socket.js",
     "dev_import": "SET NODE_ENV=qa&& babel-node importserver.js"

+ 3 - 2
pm2.json

@@ -1,9 +1,10 @@
 {
   "apps": {
-      "name": "constructioncost",
-      "script": "server.js",
+      "name": "constructionimport",
+      "script": "importserver.js",
       "output": "/home/logs/out.log",
       "error": "/home/logs/err.log",
+      "log_date_format": "YYYY-MM-DD HH:mm Z",
       "exec_mode": "cluster_mode",                
       "instances": 3, 
       "merge_logs": true

+ 1 - 0
web/building_saas/pm/js/pm_newMain.js

@@ -940,6 +940,7 @@ const projTreeObj = {
             return lineNum * defaultHeight;
         };
         TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
+            if(style.backColor == undefined) style.backColor = "white"  
             if (style.backColor) {
                 ctx.save();
                 ctx.fillStyle = style.backColor;