Skip to content

Commit 5189230

Browse files
PercoccoPercocco
committed
fix bug
1 parent a68a898 commit 5189230

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const logger = new Logger("controller")
77

88
const queryMongo = async (req, res) => {
99
if (req.headers.israwquery)
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")
10+
return await res.send(await service.rawQuery(req.query, req.body.prefix, req.body.bucketName, req.headers.visibility)) && logger.info("Raw query finished")
11+
logger.info("Query mongo")
1212
logger.debug("format ", req.query.format)
1313
if (req.query.format == "JSON") {
1414
let objectQuerySet = JSON.parse(JSON.stringify(req.body.mongoQuery || req.query))
@@ -28,15 +28,15 @@ const queryMongo = async (req, res) => {
2828
}
2929
else
3030
res.send(await service.mongoQuery({ ...req.body.mongoQuery, ...req.query }, req.body.prefix, req.body.bucketName, req.headers.visibility))
31-
logger.log("Query mongo finished")
31+
logger.info("Query mongo finished")
3232

3333
}
3434

3535
const querySQL = async (req, res) => {
36-
logger.log("Query sql")
36+
logger.info("Query sql")
3737
if (!req.body.query)
3838
return await res.status(400).send("Missing query")
39-
logger.log("Query : ", req.body.query)
39+
logger.info("Query : ", req.body.query)
4040
service.querySQL(res, req.body.query, req.body.prefix, req.body.bucketName, req.headers.visibility)
4141
}
4242

@@ -45,14 +45,14 @@ module.exports = {
4545
queryMongo, querySQL,
4646

4747
query: async (req, res) => {
48-
logger.log("Query: \n", req.query, "\n","Body : \n", req.body)
48+
logger.info("Query: \n", req.query, "\n","Body : \n", req.body)
4949
if (req.body.mongoQuery)
5050
return await queryMongo(req, res)
5151
querySQL(req, res)
5252
},
5353

5454
getValues: async (req, res) => {
55-
logger.log("values")
55+
logger.info("values")
5656
try {
5757
res.send(await service.getValues())
5858
}
@@ -63,7 +63,7 @@ module.exports = {
6363
},
6464

6565
getEntries: async (req, res) => {
66-
logger.log("values")
66+
logger.info("values")
6767
try {
6868
res.send(await service.getEntries())
6969
}
@@ -74,7 +74,7 @@ module.exports = {
7474
},
7575

7676
getKeys: async (req, res) => {
77-
logger.log("keys")
77+
logger.info("keys")
7878
try {
7979
res.send(await service.getKeys())
8080
}
@@ -85,7 +85,7 @@ module.exports = {
8585
},
8686

8787
sync: async (req, res) => {
88-
logger.log("Sync")
88+
logger.info("Sync")
8989
return await res.send(await service.sync())
9090
},
9191

‎Minio-SQL-connector/api/services/service.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async function sync() {
5959
let objectGot = await minioWriter.getObject(bucket.name, obj.name, obj.name.split(".").pop())
6060
objects.push({ raw: objectGot, info: { ...obj, bucketName: bucket.name } })
6161
}
62-
else logger.log("Size is ", obj.size, ", ", (obj.isLatest ? "is latest" : "is not latest"), " and extension ", (isAllowed ? "is allowed" : "is not allowed"))
62+
else logger.info("Size is ", obj.size, ", ", (obj.isLatest ? "is latest" : "is not latest"), " and extension ", (isAllowed ? "is allowed" : "is not allowed"))
6363
}
6464
catch (error) {
6565
logger.error(error)
@@ -199,11 +199,11 @@ async function sync() {
199199
}
200200
}
201201
syncing = false
202-
logger.log("Syncing finished")
202+
logger.info("Syncing finished")
203203
return "Sync finished"
204204
}
205205
else {
206-
logger.log("Syncing not finished")
206+
logger.info("Syncing not finished")
207207
return "Syncing"
208208
}
209209
}
@@ -394,7 +394,7 @@ module.exports = {
394394
obj.path = obj.name
395395
obj.fileType = obj.name.split(".")[obj.name.split(".").length - 1]
396396
}
397-
logger.log(result)
397+
logger.info(result)
398398
return result
399399
},
400400

@@ -415,7 +415,7 @@ module.exports = {
415415
},
416416

417417
async rawQuery(query, prefix, bucket, visibility) {
418-
logger.log("Raw query")
418+
logger.info("Raw query")
419419
//query.name = new RegExp("^" + prefix, 'i')
420420
let objects = []
421421
if (visibility == "public")
@@ -442,13 +442,13 @@ module.exports = {
442442
logger.error("ERROR");
443443
logger.error(err);
444444
response.status(500).json(err.toString())
445-
logger.log("Query sql finished with errors")
445+
logger.info("Query sql finished with errors")
446446
return;
447447
}
448448
else {
449449
response.send(res.rows.filter(obj => objectFilter(obj, prefix, bucket, visibility)).map(obj => obj.element && obj.name.split(".").pop() == "csv" ? { ...obj, element: json2csv(obj.element) } : obj))
450-
logger.log(res.rows);
451-
logger.log("Query sql finished")
450+
logger.info(res.rows);
451+
logger.info("Query sql finished")
452452
}
453453
});
454454
}

‎Minio-SQL-connector/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const common = require("./utils/common")
22
const config = common.checkConfig(require('./config'))
3-
logger.log(config.queryAllowedExtensions)
43
const express = require('express');
54
const bodyParser = require('body-parser');
65
const app = express();
@@ -11,11 +10,12 @@ const routes = require ("./api/routes/router")
1110
const Log = require('./utils/logger')//.app(module);
1211
const { Logger } = Log
1312
const logger = new Logger("service")
13+
logger.info(config.queryAllowedExtensions)
1414

1515
app.use(cors());
1616
app.use(express.urlencoded({ extended: false }));
1717
app.use(bodyParser.json());
1818
app.use(config.basePath || "/api", routes);
19-
app.listen(port, () => {logger.log(`Server listens on http://localhost:${port}`);});
20-
mongoose.connect(config.mongo, { useNewUrlParser: true }).then(() => {logger.log("Connected to mongo")})
21-
logger.log(`Node.js version: ${process.version}`);
19+
app.listen(port, () => {logger.info(`Server listens on http://localhost:${port}`);});
20+
mongoose.connect(config.mongo, { useNewUrlParser: true }).then(() => {logger.info("Connected to mongo")})
21+
logger.info(`Node.js version: ${process.version}`);

‎Minio-SQL-connector/utils/common.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ module.exports = {
208208
},
209209

210210
cleaned(obj) {
211-
//logger.log(typeof obj != "string" ? JSON.stringify(obj) : obj)
211+
//logger.info(typeof obj != "string" ? JSON.stringify(obj) : obj)
212212
//return obj
213213
//return (typeof obj != "string" ? JSON.stringify(obj) : obj).replace(/['"\r\n\s]/g, ''); /['"\r\n]/g /['"]/g
214214
//return JSON.stringify(JSON.parse((typeof obj != "string" ? JSON.stringify(obj) : obj).replace( /['\r\n]/g, '')));

‎Minio-SQL-connector/utils/minioWriter.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ function logSizeChecker() {
2828
let stats = fs.statSync(logFile)
2929
let fileSizeInBytes = stats.size;
3030
let fileSizeInMegabytes = fileSizeInBytes / (1024 * 1024);
31-
logger.log("Log size is ", fileSizeInMegabytes)
31+
logger.info("Log size is ", fileSizeInMegabytes)
3232
if (fileSizeInMegabytes > 50)
3333
fs.writeFile(logFile, "", err => {
3434
if (err) {
3535
logger.error(err);
3636
} else {
37-
logger.log("Log reset")
37+
logger.info("Log reset")
3838
}
3939
});
4040
}
@@ -352,7 +352,7 @@ async function insertInDBs(newObject, record, align) {
352352
}
353353

354354
function log2(...m) {
355-
logger.log(...m)
355+
logger.info(...m)
356356
if (config.writeLogsOnFile) {
357357
let args = [...m]
358358
for (let arg of args)
@@ -785,9 +785,9 @@ module.exports = {
785785
//const mergedValues = [...this.entities.values, ...uniqueValues];
786786
//const mergedKeys = [...this.entities.keys, ...uniqueKeys];
787787

788-
//logger.log("Merged Entries:", mergedEntries);
789-
//logger.log("Merged Values:", mergedValues);
790-
//logger.log("Merged Keys:", mergedKeys);
788+
//logger.info("Merged Entries:", mergedEntries);
789+
//logger.info("Merged Values:", mergedValues);
790+
//logger.info("Merged Keys:", mergedKeys);
791791

792792
this.entities.values = this.entities.values.concat(uniqueValues)
793793
this.entities.keys = this.entities.keys.concat(uniqueKeys)

0 commit comments

Comments
 (0)