Skip to content

Commit a2ce09a

Browse files
committed
redis queue library version update
1 parent b754e23 commit a2ce09a

File tree

10 files changed

+206
-1109
lines changed

10 files changed

+206
-1109
lines changed

libraries/database.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var mysql = require('mysql2');
1+
const mysql = require('mysql2');
22

3-
var pool = mysql.createPool({
3+
const pool = mysql.createPool({
44
host: process.env.MYSQL_HOST,
55
user: process.env.MYSQL_USER,
66
password: process.env.MYSQL_PASS,
@@ -9,7 +9,10 @@ var pool = mysql.createPool({
99
debug: process.env.MYSQL_DEBUG == 'true' ? true : false,
1010
connectionLimit: 10,
1111
supportBigNumbers: true,
12-
insecureAuth: true // *** dont use production. ***
12+
insecureAuth: true, // *** dont use production. ***
13+
maxIdle: 10,
14+
idleTimeout: 60000,
15+
queueLimit: 0
1316
});
1417

1518
module.exports = pool;

libraries/redis-client.js

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
var redis = require('redis');
2-
client = redis.createClient({'host': process.env.REDIS_HOST});
3-
4-
await client.connect();
1+
const redis = require('redis');
2+
client = redis.createClient({'url': process.env.REDIS_HOST});
53

64
const RedisClient = {
75
getClient: function() {
6+
if (!client.isOpen) {
7+
client.connect().then()
8+
}
89
return client;
910
},
1011

@@ -26,14 +27,17 @@ const RedisClient = {
2627
}
2728
},
2829

29-
get: function(key, callback) {
30-
client.get(key, function(err, result) {
31-
if (result) {
32-
callback(err, JSON.parse(result));
33-
return;
34-
}
35-
callback(true, {});
36-
});
30+
get: async function(key) {
31+
if (!client.isOpen) {
32+
await client.connect()
33+
}
34+
const value = await client.get(key);
35+
36+
if (value !== null) {
37+
return JSON.parse(value);
38+
}
39+
40+
return null;
3741
},
3842

3943
delete: function() {

0 commit comments

Comments
 (0)