Authored by 陈峰

Merge branch 'feature/logfie-name' into 'master'

Feature/logfie name



See merge request !257
@@ -88,8 +88,10 @@ module.exports = { @@ -88,8 +88,10 @@ module.exports = {
88 infoFile: { 88 infoFile: {
89 name: 'info', 89 name: 'info',
90 level: 'info', 90 level: 'info',
91 - filename: '/Data/logs/yohobuy-node/info.log',  
92 - maxFiles: 14, 91 + filename: '/Data/logs/yohobuy-node/info/info.log',
  92 + maxFiles: 1,
  93 + tailable: true,
  94 + maxsize: Math.pow(1024, 3),
93 timestamp() { 95 timestamp() {
94 return new Date().toString(); 96 return new Date().toString();
95 } 97 }
@@ -97,9 +99,11 @@ module.exports = { @@ -97,9 +99,11 @@ module.exports = {
97 errorFile: { 99 errorFile: {
98 name: 'error', 100 name: 'error',
99 level: 'error', 101 level: 'error',
100 - filename: '/Data/logs/yohobuy-node/error.log', 102 + filename: '/Data/logs/yohobuy-node/error/error.log',
  103 + maxFiles: 1,
  104 + tailable: true,
  105 + maxsize: Math.pow(1024, 3),
101 handleExceptions: true, 106 handleExceptions: true,
102 - maxFiles: 7,  
103 timestamp() { 107 timestamp() {
104 return new Date().toString(); 108 return new Date().toString();
105 } 109 }
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 "urlencode": "^1.1.0", 57 "urlencode": "^1.1.0",
58 "uuid": "^2.0.2", 58 "uuid": "^2.0.2",
59 "yoho-express-session": "^2.0.0", 59 "yoho-express-session": "^2.0.0",
60 - "yoho-node-lib": "=0.6.8", 60 + "yoho-node-lib": "=0.6.10",
61 "yoho-zookeeper": "^1.0.8" 61 "yoho-zookeeper": "^1.0.8"
62 }, 62 },
63 "devDependencies": { 63 "devDependencies": {
@@ -8441,12 +8441,6 @@ window-size@^0.1.4: @@ -8441,12 +8441,6 @@ window-size@^0.1.4:
8441 version "0.1.4" 8441 version "0.1.4"
8442 resolved "http://npm.yohops.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" 8442 resolved "http://npm.yohops.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
8443 8443
8444 -winston-daily-rotate-file@^1.1.1:  
8445 - version "1.7.2"  
8446 - resolved "http://npm.yohops.com/winston-daily-rotate-file/-/winston-daily-rotate-file-1.7.2.tgz#6502bfa297824fd982da5e5647c7538578d2f9a0"  
8447 - dependencies:  
8448 - mkdirp "0.5.1"  
8449 -  
8450 winston@^2.3.1, winston@^2.4.0: 8444 winston@^2.3.1, winston@^2.4.0:
8451 version "2.4.1" 8445 version "2.4.1"
8452 resolved "http://npm.yohops.com/winston/-/winston-2.4.1.tgz#a3a9265105564263c6785b4583b8c8aca26fded6" 8446 resolved "http://npm.yohops.com/winston/-/winston-2.4.1.tgz#a3a9265105564263c6785b4583b8c8aca26fded6"
@@ -8670,9 +8664,9 @@ yoho-jquery@^1.12.4: @@ -8670,9 +8664,9 @@ yoho-jquery@^1.12.4:
8670 version "1.12.4" 8664 version "1.12.4"
8671 resolved "http://npm.yohops.com/yoho-jquery/-/yoho-jquery-1.12.4.tgz#22499b325f293ee8b1d60559777348156494926d" 8665 resolved "http://npm.yohops.com/yoho-jquery/-/yoho-jquery-1.12.4.tgz#22499b325f293ee8b1d60559777348156494926d"
8672 8666
8673 -yoho-node-lib@=0.6.8:  
8674 - version "0.6.8"  
8675 - resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.8.tgz#299266f52b9a8cf86f3a439529a5e00b9e9592f2" 8667 +yoho-node-lib@=0.6.10:
  8668 + version "0.6.10"
  8669 + resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.10.tgz#2e697465e1bbe8197f55c68717a0ffd3b9308687"
8676 dependencies: 8670 dependencies:
8677 dnscache "^1.0.1" 8671 dnscache "^1.0.1"
8678 handlebars "^4.0.5" 8672 handlebars "^4.0.5"
@@ -8687,7 +8681,6 @@ yoho-node-lib@=0.6.8: @@ -8687,7 +8681,6 @@ yoho-node-lib@=0.6.8:
8687 uuid "^3.0.1" 8681 uuid "^3.0.1"
8688 walk "^2.3.9" 8682 walk "^2.3.9"
8689 winston "^2.4.0" 8683 winston "^2.4.0"
8690 - winston-daily-rotate-file "^1.1.1"  
8691 xss-filters "^1.2.6" 8684 xss-filters "^1.2.6"
8692 8685
8693 yoho-qs@^1.0.1: 8686 yoho-qs@^1.0.1: