Merge branch 'feature/influxdb-log' into develop
Conflicts: library/api.js
Showing
4 changed files
with
24 additions
and
17 deletions
@@ -7,26 +7,29 @@ | @@ -7,26 +7,29 @@ | ||
7 | 7 | ||
8 | module.exports = { | 8 | module.exports = { |
9 | domains: { | 9 | domains: { |
10 | - api:'http://192.168.102.202:8088/platform' | 10 | + api: 'http://192.168.102.202:8088/platform' |
11 | }, | 11 | }, |
12 | loggers: { | 12 | loggers: { |
13 | - file:{ | ||
14 | - level:'info', | ||
15 | - maxsize:100 * 1024 * 1024, | ||
16 | - handleExceptions:true, | ||
17 | - zippedArchive:true, | ||
18 | - timestamp:true, | ||
19 | - filename:'info.log' | 13 | + infoFile: { |
14 | + name: 'info', | ||
15 | + level: 'info', | ||
16 | + filename: 'info.log' | ||
17 | + }, | ||
18 | + errorFile: { | ||
19 | + name: 'error', | ||
20 | + level: 'error', | ||
21 | + filename: 'error.log', | ||
22 | + handleExceptions: true | ||
20 | }, | 23 | }, |
21 | udp: { // send by udp | 24 | udp: { // send by udp |
22 | - level:'debug', // logger level | ||
23 | - host:'192.168.102.162', // influxdb host | ||
24 | - port:'4444'// influxdb port | 25 | + level: 'debug', // logger level |
26 | + host: '192.168.102.162', // influxdb host | ||
27 | + port: '4444'// influxdb port | ||
25 | }, | 28 | }, |
26 | - 'console':{ | ||
27 | - level:'debug', | 29 | + console: { |
30 | + level: 'debug', | ||
28 | colorize: 'all', | 31 | colorize: 'all', |
29 | - prettyPrint:true | 32 | + prettyPrint: true |
30 | } | 33 | } |
31 | } | 34 | } |
32 | }; | 35 | }; |
@@ -7,13 +7,15 @@ | @@ -7,13 +7,15 @@ | ||
7 | 'use strict'; | 7 | 'use strict'; |
8 | 8 | ||
9 | let winston = require('winston'), | 9 | let winston = require('winston'), |
10 | - config = require('../config/common'); | 10 | + config = require('../config/common'), |
11 | + FileTransport = require('winston-daily-rotate-file'); | ||
11 | 12 | ||
12 | require('influxdb-winston'); | 13 | require('influxdb-winston'); |
13 | 14 | ||
14 | let logger = new (winston.Logger)({ | 15 | let logger = new (winston.Logger)({ |
15 | transports: [ | 16 | transports: [ |
16 | - new (winston.transports.File)(config.loggers.file), | 17 | + new (FileTransport)(config.loggers.infoFile), |
18 | + new (FileTransport)(config.loggers.errorFile), | ||
17 | new (winston.transports.UdpTransport)(config.loggers.udp), | 19 | new (winston.transports.UdpTransport)(config.loggers.udp), |
18 | new (winston.transports.Console)(config.loggers.console) | 20 | new (winston.transports.Console)(config.loggers.console) |
19 | ] | 21 | ] |
@@ -28,7 +28,8 @@ | @@ -28,7 +28,8 @@ | ||
28 | "morgan": "^1.7.0", | 28 | "morgan": "^1.7.0", |
29 | "request-promise": "^3.0.0", | 29 | "request-promise": "^3.0.0", |
30 | "serve-favicon": "^2.3.0", | 30 | "serve-favicon": "^2.3.0", |
31 | - "winston": "^2.2.0" | 31 | + "winston": "^2.2.0", |
32 | + "winston-daily-rotate-file": "^1.0.1" | ||
32 | }, | 33 | }, |
33 | "devDependencies": { | 34 | "devDependencies": { |
34 | "autoprefixer": "^6.3.6", | 35 | "autoprefixer": "^6.3.6", |
-
Please register or login to post a comment