| @@ -1,3 +1,4 @@ | |||
| node_modules/ | |||
| loggerFiles/ | |||
| public/loggerFiles | |||
| public/loggerFiles | |||
| .idea | |||
| @@ -12,7 +12,6 @@ | |||
| "bcryptjs": "^2.4.3", | |||
| "config": "^3.3.7", | |||
| "cors": "^2.8.5", | |||
| "elmah.io.javascript": "^3.7.0", | |||
| "express": "^4.18.1", | |||
| "express-jwt": "^7.7.2", | |||
| "helmet": "^5.1.0", | |||
| @@ -967,11 +966,6 @@ | |||
| "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", | |||
| "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" | |||
| }, | |||
| "node_modules/elmah.io.javascript": { | |||
| "version": "3.7.0", | |||
| "resolved": "https://registry.npmjs.org/elmah.io.javascript/-/elmah.io.javascript-3.7.0.tgz", | |||
| "integrity": "sha512-s7yyLo8tlZPURYxsT4tS977FfEXXaMzkbxZNLVRc90v949NgdfeJYLYyYe6c5fhcQkiIPsy3TgOCErSpaJWGvw==" | |||
| }, | |||
| "node_modules/emoji-regex": { | |||
| "version": "8.0.0", | |||
| "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", | |||
| @@ -3985,11 +3979,6 @@ | |||
| "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", | |||
| "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" | |||
| }, | |||
| "elmah.io.javascript": { | |||
| "version": "3.7.0", | |||
| "resolved": "https://registry.npmjs.org/elmah.io.javascript/-/elmah.io.javascript-3.7.0.tgz", | |||
| "integrity": "sha512-s7yyLo8tlZPURYxsT4tS977FfEXXaMzkbxZNLVRc90v949NgdfeJYLYyYe6c5fhcQkiIPsy3TgOCErSpaJWGvw==" | |||
| }, | |||
| "emoji-regex": { | |||
| "version": "8.0.0", | |||
| "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", | |||
| @@ -16,7 +16,6 @@ | |||
| "bcryptjs": "^2.4.3", | |||
| "config": "^3.3.7", | |||
| "cors": "^2.8.5", | |||
| "elmah.io.javascript": "^3.7.0", | |||
| "express": "^4.18.1", | |||
| "express-jwt": "^7.7.2", | |||
| "helmet": "^5.1.0", | |||
| @@ -1,20 +1,21 @@ | |||
| const winston = require('winston') | |||
| const config = require('config') | |||
| const loggerWinston = winston.createLogger({ | |||
| const logger = winston.createLogger({ | |||
| level: 'info', | |||
| format: winston.format.json(), | |||
| defaultMeta: { service: 'user-service' }, | |||
| transports: [ | |||
| new winston.transports.File({ filename: '../public/loggerFiles/error.log', level: 'error' }), | |||
| new winston.transports.File({ filename: '../public/loggerFiles/all.log', level: 'silly' }), | |||
| new winston.transports.Console({level: 'silly'}), | |||
| ], | |||
| }); | |||
| if (config.util.getEnv('NODE_ENV') !== 'production') { | |||
| loggerWinston.add(new winston.transports.Console({ | |||
| logger.add(new winston.transports.Console({ | |||
| format: winston.format.simple(), | |||
| })); | |||
| } | |||
| module.exports = loggerWinston | |||
| module.exports = logger | |||
| @@ -1,10 +0,0 @@ | |||
| // const Elmahio = require("elmah.io.javascript") | |||
| // | |||
| // // TODO: da li ovo treba u configu (appsettings.json) da bude ili moze ovde hardkodirano | |||
| // const loggerElmah = new Elmahio({ | |||
| // apiKey: 'API_KEY', | |||
| // logId: 'LOG_ID', | |||
| // application: 'diligent-node-api' | |||
| // }) | |||
| // | |||
| // module.exports = loggerElmah | |||
| @@ -1,14 +1,11 @@ | |||
| //const loggerElmah = require('../logging/loggerElmah') | |||
| const loggerWinston = require('../logging/loggerWinston') | |||
| const logger = require('../logging/logger') | |||
| const config = require('config') | |||
| const errorLogger = (err, req, res, next) => { | |||
| console.error(err) | |||
| //console.error(err) | |||
| if (config.util.getEnv('NODE_ENV') === 'development') | |||
| loggerWinston.error(err) | |||
| // else | |||
| // loggerElmah.error('There has been an error', err) | |||
| logger.error(err) | |||
| next(err) | |||
| } | |||
| @@ -1,4 +1,4 @@ | |||
| const logger = require("../logging/loggerWinston") | |||
| const logger = require("../logging/logger") | |||
| const requestLogging = async (req, res, next) => { | |||
| res.header("Content-Type", 'application/json'); | |||