This commit is contained in:
Christopher Cookman 2023-10-02 17:45:59 -06:00
parent 115b83b281
commit d825a9f055
Signed by: ChrisChrome
GPG key ID: A023A26E42C33A42

View file

@ -156,8 +156,10 @@ const cdrPool = mariadb.createPool(config.cdrdb);
const generateExtensionListEmbed = async () => { const generateExtensionListEmbed = async () => {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try {
var conn = await cdrPool.getConnection(); var conn = await cdrPool.getConnection();
pbxClient.request(funcs.generateQuery("list", {})).then((result) => { const result = await pbxClient.request(funcs.generateQuery("list", {}));
console.log("1debug start get extensions") console.log("1debug start get extensions")
let extensions = result.fetchAllExtensions.extension; let extensions = result.fetchAllExtensions.extension;
let extensionList = {}; let extensionList = {};
@ -168,13 +170,13 @@ const generateExtensionListEmbed = async () => {
// Construct SQL query to check all unique extensions at the same time // Construct SQL query to check all unique extensions at the same time
console.log("2 debug start SQL query") console.log("2 debug start SQL query")
conn.query(` const rows = await conn.query(`
SELECT cid_num SELECT cid_num
FROM cel FROM cel
WHERE cid_num IN (${uniqueExtensions.join(",")}) WHERE cid_num IN (${uniqueExtensions.join(",")})
AND eventtime >= DATE_SUB(CURDATE(), INTERVAL 30 DAY) AND eventtime >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
`) `);
.then((rows) => {
console.log(`2.1 query end ${rows.length}`) console.log(`2.1 query end ${rows.length}`)
// Add extensions that weren't in the results to the inactive array // Add extensions that weren't in the results to the inactive array
@ -184,11 +186,6 @@ const generateExtensionListEmbed = async () => {
} }
}); });
}).catch((error) => {
console.log("2.2 query error")
reject(error);
});
console.log("3 debug start foreach") console.log("3 debug start foreach")
extensions.forEach((extension) => { extensions.forEach((extension) => {
console.log("3.1 foreach start") console.log("3.1 foreach start")
@ -212,11 +209,12 @@ const generateExtensionListEmbed = async () => {
}] }]
} }
resolve(res); resolve(res);
}).catch((error) => { } catch (error) {
reject(error); reject(error);
}); } finally {
conn.end(); conn.end();
}) }
});
}; };
const lookupExtension = (ident, type) => { // type is either "ext" or "uid" const lookupExtension = (ident, type) => { // type is either "ext" or "uid"