Skip to content

Commit a68a898

Browse files
PercoccoPercocco
committed
use only custom logger
1 parent 42a31fb commit a68a898

File tree

9 files changed

+206
-124
lines changed

9 files changed

+206
-124
lines changed

‎Minio-SQL-connector/api/controllers/controller.js‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
const service = require("../services/service.js")
22
const common = require("../../utils/common.js")
3+
const Log = require('../../utils/logger.js')//.app(module);
4+
const { Logger } = Log
5+
const logger = new Logger("controller")
36

47

58
const queryMongo = async (req, res) => {
69
if (req.headers.israwquery)
7-
return await res.send(await service.rawQuery(req.query, req.body.prefix, req.body.bucketName, req.headers.visibility)) && console.log("Raw query finished")
8-
console.log("Query mongo")
9-
console.debug("format ", req.query.format)
10+
return await res.send(await service.rawQuery(req.query, req.body.prefix, req.body.bucketName, req.headers.visibility)) && logger.log("Raw query finished")
11+
logger.log("Query mongo")
12+
logger.debug("format ", req.query.format)
1013
if (req.query.format == "JSON") {
1114
let objectQuerySet = JSON.parse(JSON.stringify(req.body.mongoQuery || req.query))
1215
objectQuerySet.format = "Object"
@@ -25,15 +28,15 @@ const queryMongo = async (req, res) => {
2528
}
2629
else
2730
res.send(await service.mongoQuery({ ...req.body.mongoQuery, ...req.query }, req.body.prefix, req.body.bucketName, req.headers.visibility))
28-
console.log("Query mongo finished")
31+
logger.log("Query mongo finished")
2932

3033
}
3134

3235
const querySQL = async (req, res) => {
33-
console.log("Query sql")
36+
logger.log("Query sql")
3437
if (!req.body.query)
3538
return await res.status(400).send("Missing query")
36-
console.log("Query : ", req.body.query)
39+
logger.log("Query : ", req.body.query)
3740
service.querySQL(res, req.body.query, req.body.prefix, req.body.bucketName, req.headers.visibility)
3841
}
3942

@@ -42,47 +45,47 @@ module.exports = {
4245
queryMongo, querySQL,
4346

4447
query: async (req, res) => {
45-
console.log("Query: \n", req.query, "\n","Body : \n", req.body)
48+
logger.log("Query: \n", req.query, "\n","Body : \n", req.body)
4649
if (req.body.mongoQuery)
4750
return await queryMongo(req, res)
4851
querySQL(req, res)
4952
},
5053

5154
getValues: async (req, res) => {
52-
console.log("values")
55+
logger.log("values")
5356
try {
5457
res.send(await service.getValues())
5558
}
5659
catch (error) {
57-
console.error(error)
60+
logger.error(error)
5861
res.status(500).send(error.toString() == "[object Object]" ? error : error.toString())
5962
}
6063
},
6164

6265
getEntries: async (req, res) => {
63-
console.log("values")
66+
logger.log("values")
6467
try {
6568
res.send(await service.getEntries())
6669
}
6770
catch (error) {
68-
console.error(error)
71+
logger.error(error)
6972
res.status(500).send(error.toString() == "[object Object]" ? error : error.toString())
7073
}
7174
},
7275

7376
getKeys: async (req, res) => {
74-
console.log("keys")
77+
logger.log("keys")
7578
try {
7679
res.send(await service.getKeys())
7780
}
7881
catch (error) {
79-
console.error(error)
82+
logger.error(error)
8083
res.status(500).send(error.toString() == "[object Object]" ? error : error.toString())
8184
}
8285
},
8386

8487
sync: async (req, res) => {
85-
console.log("Sync")
88+
logger.log("Sync")
8689
return await res.send(await service.sync())
8790
},
8891

@@ -91,7 +94,7 @@ module.exports = {
9194
res.send(await service.minioListObjects(req.params.bucketName || req.query.bucketName))
9295
}
9396
catch (error) {
94-
console.error(error)
97+
logger.error(error)
9598
res.status(500).send(error.toString() == "[object Object]" ? error : error.toString())
9699
}
97100
},

‎Minio-SQL-connector/api/middlewares/auth.js‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ const realm = authConfig.authRealm;
77
const clientID = authConfig.clientId;
88
const clientSecret = authConfig.secret;
99
const {parseJwt} = require("../../utils/common")
10+
const Log = require('../../utils/logger')//.app(module);
11+
const { Logger } = Log
12+
const logger = new Logger("auth")
1013

1114
module.exports = {
1215
auth: async (req, res, next) => {
@@ -45,7 +48,7 @@ module.exports = {
4548
}
4649
catch (error) {
4750

48-
console.error(error)
51+
logger.error(error)
4952
if (error.message == "invalid token" || error.message == "jwt expired" || error.message == "jwt malformed")
5053
return res.sendStatus(403);
5154
else
@@ -64,16 +67,16 @@ module.exports = {
6467
axios.post(introspectionEndpoint, data)
6568
.then(response => {
6669
if (response.data.active) {
67-
console.info('Token valid:', response.data);
70+
logger.info('Token valid:', response.data);
6871
next();
6972
} else {
70-
console.error('Token not valid.');
73+
logger.error('Token not valid.');
7174
return res.sendStatus(403);
7275
}
7376
})
7477
.catch(error => {
75-
console.error(error.response.data)
76-
console.error('Errore during token verify:', error.message);
78+
logger.error(error.response.data)
79+
logger.error('Errore during token verify:', error.message);
7780
return res.sendStatus(500);
7881
});
7982
}
@@ -89,17 +92,17 @@ module.exports = {
8992
req.body.bucketName = pilot.toLowerCase() //+ "/" + email + "/" + config.minioConfig.defaultInputFolderName//{pilot, email}
9093
req.body.prefix = (email || username) + "/" + config.minioConfig.defaultInputFolderName
9194
config.group = email || username
92-
console.debug(req.body.prefix)
95+
logger.debug(req.body.prefix)
9396
}
9497
catch (error) {
95-
console.error(error?.toString())
96-
console.error(error?.response?.data || error?.response)
98+
logger.error(error?.toString())
99+
logger.error(error?.response?.data || error?.response)
97100
req.body.prefix = decodedToken.email
98101
config.group = decodedToken.email
99102
}
100103

101104
//if (req.params.bucketName && req.params.objectName)
102-
// console.debug(req.body.bucketName , req.params.bucketName , req.body.prefix , req.params.objectName.split("/")[0] + "/" + req.params.objectName.split("/")[1])
105+
// logger.debug(req.body.bucketName , req.params.bucketName , req.body.prefix , req.params.objectName.split("/")[0] + "/" + req.params.objectName.split("/")[1])
103106
let deniedQuery, query
104107
try {
105108
if (req.body.query) {
@@ -117,7 +120,7 @@ module.exports = {
117120
// res.status(403).send("Available bucketname is " + req.body.bucketName + " and you tried to access " + req.body.query.split("FROM ")[1].split(" ") + ".\nAvailable prefix is " + req.body.prefix + " and you tried to access this object " + req.body.query.split("name = '")[1].split("'"));
118121
}
119122
catch (error) {
120-
console.error(error)
123+
logger.error(error)
121124
next()
122125
}
123126
}

‎Minio-SQL-connector/api/models/entries.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
const mongoose = require("mongoose");
22

3-
const key = mongoose.Schema({
4-
key: { type: String, required: true},
5-
value: { type: mongoose.Schema.Types.Mixed, required: true},
6-
}, { versionKey: false });
3+
const key = mongoose.Schema(
4+
{
5+
key: { type: String, required: true },
6+
value: { type: mongoose.Schema.Types.Mixed, required: true },
7+
name: { type: String, required: true }//,
8+
//visibility: { type: String, required: true },
9+
//group: { type: String, required: true }
10+
},
11+
{ versionKey: false }
12+
);
713

814
module.exports = mongoose.model("entries", key);

‎Minio-SQL-connector/api/models/key.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
const mongoose = require("mongoose");
22

3-
const key = mongoose.Schema({
4-
key: { type: String, required: true}}, {versionKey: false }
5-
);
3+
const key = mongoose.Schema(
4+
{
5+
key: { type: String, required: true },
6+
name: { type: String, required: true }//,
7+
//visibility: { type: String, required: true },
8+
//group: { type: String, required: true }
9+
},
10+
{ versionKey: false }
11+
);
612

713
module.exports = mongoose.model("key", key);

‎Minio-SQL-connector/api/models/value.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
const mongoose = require("mongoose");
22

3-
const value = mongoose.Schema({
4-
value: { type: mongoose.Schema.Types.Mixed, required: true}
5-
}, { versionKey: false });
3+
const value = mongoose.Schema(
4+
{
5+
value: { type: mongoose.Schema.Types.Mixed, required: true },
6+
name: { type: String, required: true }//,
7+
//visibility: { type: String, required: true },
8+
//group: { type: String, required: true }
9+
},
10+
{ versionKey: false }
11+
);
612

713
module.exports = mongoose.model("value", value);

0 commit comments

Comments
 (0)