From 32707d0d1299c3b3784fffbefa1e6e878093292a Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Mon, 27 Apr 2020 15:05:18 +0200
Subject: [PATCH] Fixing import problems
---
index.js | 12 ++++++++----
routes/map.routes.js | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/index.js b/index.js
index 660fb2a..fc9ff04 100644
--- a/index.js
+++ b/index.js
@@ -4,6 +4,7 @@ const port = 9000;
const httpProxy = require('http-proxy');
const cookieParser = require('cookie-parser');
const printError = require('./helpers/logs.helpers.js').printError;
+const printLog = require('./helpers/logs.helpers.js').printLog;
// Parse the request headers in order to populate req.cookies
app.use(cookieParser());
@@ -44,7 +45,8 @@ const IGNProxy = httpProxy.createProxyServer({
if (req.socket.destroyed && err.code === 'ECONNRESET') {
req._proxyReq.abort();
}
- return console.log(`ING proxy error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ printError(`ING proxy error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ return;
});
const AuthenticatedProxy = httpProxy.createProxyServer({
@@ -59,7 +61,8 @@ const AuthenticatedProxy = httpProxy.createProxyServer({
if (req.socket.destroyed && err.code === 'ECONNRESET') {
req._proxyReq.abort();
}
- return printError(`Authenticated proxy error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ printError(`Authenticated proxy error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ return;
});
var UnauthenticatedProxy = httpProxy.createProxyServer({
@@ -73,7 +76,8 @@ var UnauthenticatedProxy = httpProxy.createProxyServer({
if (req.socket.destroyed && err.code === 'ECONNRESET') {
req._proxyReq.abort();
}
- return printError(`Unauthenticated proxy Error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ printError(`Unauthenticated proxy Error, req.socket.destroyed: ${req.socket.destroyed}, ${err}`);
+ return;
});
app.locals.proxies = {
@@ -86,4 +90,4 @@ app.locals.proxies = {
app.use(require('./routes/index.js'));
// STARTING SERVER
-app.listen(port, () => printError(`Proxy listening on port: ${port}`));
\ No newline at end of file
+app.listen(port, () => printLog('index.js', `Proxy listening on port: ${port}`));
\ No newline at end of file
diff --git a/routes/map.routes.js b/routes/map.routes.js
index 5b60fae..ae1af06 100644
--- a/routes/map.routes.js
+++ b/routes/map.routes.js
@@ -2,6 +2,7 @@ const router = require('express').Router();
const getRedisValue = require('../helpers/redis.helpers.js').getRedisValue;
const setRedisValue = require('../helpers/redis.helpers.js').setRedisValue;
const getDatasetInfoFromES = require('../helpers/elasticsearch.helpers.js').getDatasetInfoFromES;
+const printError = require('../helpers/logs.helpers.js').printError;
router.get('/ign', (req, res, next) => {
req.headers['referer'] = 'grandlyon.com';
--
GitLab