diff --git a/images/clubpenguin.jpeg b/images/clubpenguin.jpeg new file mode 100644 index 000000000..6246fc704 Binary files /dev/null and b/images/clubpenguin.jpeg differ diff --git a/images/dankocmeme.jpg b/images/dankocmeme.jpg new file mode 100644 index 000000000..3a2001972 Binary files /dev/null and b/images/dankocmeme.jpg differ diff --git a/images/happening.gif b/images/happening.gif new file mode 100644 index 000000000..24dd9e6ec Binary files /dev/null and b/images/happening.gif differ diff --git a/images/highqualitybait.png b/images/highqualitybait.png new file mode 100644 index 000000000..c8d4f3bf9 Binary files /dev/null and b/images/highqualitybait.png differ diff --git a/images/johncena.gif b/images/johncena.gif new file mode 100644 index 000000000..3f6286f88 Binary files /dev/null and b/images/johncena.gif differ diff --git a/images/kappa.png b/images/kappa.png new file mode 100644 index 000000000..a8be5d216 Binary files /dev/null and b/images/kappa.png differ diff --git a/images/newfeaturespls.jpg b/images/newfeaturespls.jpg new file mode 100644 index 000000000..af810157f Binary files /dev/null and b/images/newfeaturespls.jpg differ diff --git a/images/subparmeme.jpg b/images/subparmeme.jpg new file mode 100644 index 000000000..2cad26615 Binary files /dev/null and b/images/subparmeme.jpg differ diff --git a/images/topkek.png b/images/topkek.png new file mode 100644 index 000000000..009d03fa4 Binary files /dev/null and b/images/topkek.png differ diff --git a/images/trollingtheinterwebs.png b/images/trollingtheinterwebs.png new file mode 100644 index 000000000..b8f71f39a Binary files /dev/null and b/images/trollingtheinterwebs.png differ diff --git a/package.json b/package.json index 0892515ba..592b4166e 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,10 @@ "pmx": "^0.6.0", "request": "^2.61.0", "unirest": "*", - "winston": "^1.1.1", + "winston": "^2.1.1", + "winston-daily-rotate-file": "^1.0.1", "xml2js": "*", - "youtube-node": "1.2.x", + "youtube-node": "1.3.0", "ytdl-core": "^0.7.10" }, "main": "DougBot.js" diff --git a/runtime/logger.js b/runtime/logger.js index 157f00573..a4ef2bb29 100644 --- a/runtime/logger.js +++ b/runtime/logger.js @@ -6,48 +6,30 @@ Winston.emitErrs = true; exports.ChatLog = new Winston.Logger({ transports: [ - new Winston.transports.DailyRotateFile({ - handleExceptions: false, - name: 'file:chat', - filename: __dirname + '/../logs/chat', - datePattern: '-dd-MM-yyyy.log', - formatter: function(args) { - return args.message; - }, + new (require('winston-daily-rotate-file'))({ level: 'info', - json: false + filename: __dirname + '/../logs/chatlog', + datePattern: '-dd-MM-yyyy.log' }) ] }); exports.DebugModeLog = new Winston.Logger({ transports: [ - new Winston.transports.DailyRotateFile({ - handleExceptions: false, - name: 'file:debugmodelog', - filename: __dirname + '/../logs/debugmodelog', - datePattern: '-dd-MM-yyyy.log', - formatter: function(args) { - return args.message; - }, + new (require('winston-daily-rotate-file'))({ level: 'debug', - json: false + filename: __dirname + '/../logs/debugmodelog', + datePattern: '-dd-MM-yyyy.log' }) ] }); exports.VerboseModeLog = new Winston.Logger({ transports: [ - new Winston.transports.DailyRotateFile({ - handleExceptions: false, - name: 'file:verbosemodelog', - filename: __dirname + '/../logs/verbosemodelog', + new (require('winston-daily-rotate-file'))({ + level: 'info', datePattern: '-dd-MM-yyyy.log', - formatter: function(args) { - return args.message; - }, - level: 'debug', - json: false + filename: __dirname + '/../logs/verbosemodelog' }) ] }); @@ -63,33 +45,30 @@ exports.Logger = new Winston.Logger({ error: 'red' }, transports: [ - new Winston.transports.DailyRotateFile({ + new (require('winston-daily-rotate-file'))({ humanReadableUnhandledException: true, - handleExceptions: true, name: 'file:exceptions', filename: __dirname + '/../logs/exceptions', datePattern: '-dd-MM-yyyy.log', level: 'exception', json: false }), - new Winston.transports.DailyRotateFile({ - handleExceptions: false, + new (require('winston-daily-rotate-file'))({ name: 'file:error', filename: __dirname + '/../logs/errors', datePattern: '-dd-MM-yyyy.log', level: 'error', json: false }), - new Winston.transports.DailyRotateFile({ - handleExceptions: false, + new (require('winston-daily-rotate-file'))({ name: 'file:console', filename: __dirname + '/../logs/console', datePattern: '-dd-MM-yyyy.log', level: 'debug', json: false }), - new Winston.transports.Console({ - handleExceptions: true, + new (Winston.transports.Console)({ + humanReadableUnhandledException: true, level: 'verbose', colorize: true, json: false