less messages, more meaning

This commit is contained in:
Luke Berndt
2024-10-13 09:58:21 -04:00
parent f6853d69fb
commit abee28c030
3 changed files with 67 additions and 63 deletions

View File

@@ -144,7 +144,7 @@ async function load_systems(systemClients) {
} }
// don't update the systemList until we have all the data or else load_systems will be called multiple times // don't update the systemList until we have all the data or else load_systems will be called multiple times
systemList = tempList; systemList = tempList;
console.log("Loaded Systems: " + systemList.length + " that have been active since: " + fromDate); // console.log("Loaded Systems: " + systemList.length + " that have been active since: " + fromDate);
} }

View File

@@ -256,6 +256,10 @@ exports.upload = async function (req, res, next) {
message: error.message, message: error.message,
}); });
} finally { } finally {
const totalTime = Date.now() - start_time;
if (totalTime > 1000) {
console.warn(`[${req.params.shortName}] Slow Upload - Size: ${call.len} \t Verify System: ${validateSystemTime - start_time} \t Read file: ${readFileTime - validateSystemTime} \t Upload: ${ uploadFileTime - validateSystemTime} \t Save: ${saveCallTime - uploadFileTime} \tStats: ${statsTime - saveCallTime}\tCleanup: ${cleanupTime - statsTime} \t\t Total: ${totalTime}`);
}
span.end(); span.end();
} }

View File

@@ -43,12 +43,12 @@ async function updateActiveSystems() {
await item.save(); await item.save();
}; };
updateUploadsPerMin(siteTotal); updateUploadsPerMin(siteTotal);
// Save talkgroupStats to a JSON file // Save talkgroupStats to a JSON file
const filePath = "/data/stats/uploadsPerMin.json"; const filePath = "/data/stats/uploadsPerMin.json";
fs.writeFileSync(filePath, JSON.stringify(uploadsPerMin)); fs.writeFileSync(filePath, JSON.stringify(uploadsPerMin));
console.log("Saved uploadsPerMin to JSON file"); // console.log("Saved uploadsPerMin to JSON file");
console.log("Site average uploads per minute: " + siteTotal / timePeriod); // console.log("Site average uploads per minute: " + siteTotal / timePeriod);
console.log("Active Systems: " + activeSystems); // console.log("Active Systems: " + activeSystems);
} }
exports.initStats = async function () { exports.initStats = async function () {
@@ -102,44 +102,44 @@ exports.initStats = async function () {
} }
/* /*
for await (const item of SystemStat.find()) { for await (const item of SystemStat.find()) {
const obj = item.toObject(); const obj = item.toObject();
// Talkgroup Stats // Talkgroup Stats
if (obj.talkgroupStats !== undefined) { if (obj.talkgroupStats !== undefined) {
talkgroupStats[obj.shortName] = Object.fromEntries(obj.talkgroupStats); talkgroupStats[obj.shortName] = Object.fromEntries(obj.talkgroupStats);
} }
// Decode Errors // Decode Errors
if (obj.decodeErrorsFreq !== undefined) { if (obj.decodeErrorsFreq !== undefined) {
decodeErrorsFreq[obj.shortName] = Object.fromEntries(obj.decodeErrorsFreq); decodeErrorsFreq[obj.shortName] = Object.fromEntries(obj.decodeErrorsFreq);
} }
// Upload Error Totals // Upload Error Totals
if (obj.uploadErrors !== undefined) { if (obj.uploadErrors !== undefined) {
uploadErrors[obj.shortName] = obj.uploadErrors; uploadErrors[obj.shortName] = obj.uploadErrors;
} }
if (obj.callTotals !== undefined) { if (obj.callTotals !== undefined) {
callTotals[obj.shortName] = obj.callTotals; callTotals[obj.shortName] = obj.callTotals;
} }
};*/ };*/
} }
// keeps track of the number of calls that get uploaded with an audio file // keeps track of the number of calls that get uploaded with an audio file
exports.addError = function (call) { exports.addError = function (call) {
/* /*
// if there is no Array associated with the system. // if there is no Array associated with the system.
if (uploadErrors[call.shortName] === undefined) { if (uploadErrors[call.shortName] === undefined) {
uploadErrors[call.shortName] = new Array(); uploadErrors[call.shortName] = new Array();
for (var j = 0; j < spots; j++) { for (var j = 0; j < spots; j++) {
uploadErrors[call.shortName][j] = 0; uploadErrors[call.shortName][j] = 0;
}
} }
}
// Add an error to the count for the current period. // Add an error to the count for the current period.
uploadErrors[call.shortName][0]++;*/ uploadErrors[call.shortName][0]++;*/
} }
// Keeps track of the number of calls for each talkgroup for a system // Keeps track of the number of calls for each talkgroup for a system
@@ -150,8 +150,8 @@ exports.addCall = function (call) {
} }
callTotals[call.shortName]++; callTotals[call.shortName]++;
// if you haven't started keeping track of stats for the System yet // if you haven't started keeping track of stats for the System yet
if (talkgroupStats[call.shortName] === undefined) { if (talkgroupStats[call.shortName] === undefined) {
talkgroupStats[call.shortName] = {}; talkgroupStats[call.shortName] = {};
} }
var sysTalkgroupStats = talkgroupStats[call.shortName]; var sysTalkgroupStats = talkgroupStats[call.shortName];
@@ -205,14 +205,14 @@ exports.shiftStats = async function () {
// Save decodeErrorsFreq to a JSON file // Save decodeErrorsFreq to a JSON file
const decodeErrorsFreqPath = "/data/stats/decodeErrorsFreq.json"; const decodeErrorsFreqPath = "/data/stats/decodeErrorsFreq.json";
fs.writeFileSync(decodeErrorsFreqPath, JSON.stringify(decodeErrorsFreq)); fs.writeFileSync(decodeErrorsFreqPath, JSON.stringify(decodeErrorsFreq));
console.log("Saved decodeErrorsFreq to JSON file"); //console.log("Saved decodeErrorsFreq to JSON file");
// Save talkgroupStats to a JSON file // Save talkgroupStats to a JSON file
const filePath = "/data/stats/talkgroups.json"; const filePath = "/data/stats/talkgroups.json";
fs.writeFileSync(filePath, JSON.stringify(talkgroupStats)); fs.writeFileSync(filePath, JSON.stringify(talkgroupStats));
console.log("Saved talkgroupStats to JSON file"); //console.log("Saved talkgroupStats to JSON file");
console.log("Started Shifting Stats at: " + new Date()); //console.log("Started Shifting Stats at: " + new Date());
// for all the systems in Error Stats // for all the systems in Error Stats
for (var shortName in uploadErrors) { for (var shortName in uploadErrors) {
if (uploadErrors.hasOwnProperty(shortName)) { if (uploadErrors.hasOwnProperty(shortName)) {
@@ -231,7 +231,7 @@ exports.shiftStats = async function () {
uploadErrors[shortName][0] = 0; uploadErrors[shortName][0] = 0;
} }
} }
console.log("Finished Shifting Upload Errors at: " + new Date()); //console.log("Finished Shifting Upload Errors at: " + new Date());
// for each system in decodeErrorsFreq // for each system in decodeErrorsFreq
for (let shortName in decodeErrorsFreq) { for (let shortName in decodeErrorsFreq) {
@@ -280,7 +280,7 @@ exports.shiftStats = async function () {
} }
} }
console.log("Finished Shifting Decode Errors at: " + new Date()); //console.log("Finished Shifting Decode Errors at: " + new Date());
// for each system in talkgroupStats // for each system in talkgroupStats
for (let shortName in talkgroupStats) { for (let shortName in talkgroupStats) {
@@ -329,17 +329,17 @@ exports.shiftStats = async function () {
} }
// figure out call totals for this shortName/Sys // figure out call totals for this shortName/Sys
/* if (callTotals[shortName] == undefined) { /* if (callTotals[shortName] == undefined) {
callTotals[shortName] = new Array(); callTotals[shortName] = new Array();
for (var j = 0; j < spots; j++) { for (var j = 0; j < spots; j++) {
callTotals[shortName][j] = 0; callTotals[shortName][j] = 0;
} }
} }
for (var j = spots - 1; j > 0; j--) { for (var j = spots - 1; j > 0; j--) {
callTotals[shortName][j] = callTotals[shortName][j - 1]; callTotals[shortName][j] = callTotals[shortName][j - 1];
} }
callTotals[shortName][0] = callTotal;*/ callTotals[shortName][0] = callTotal;*/
/* /*
@@ -350,14 +350,14 @@ exports.shiftStats = async function () {
await SystemStat.updateOne(query, update, options);*/ await SystemStat.updateOne(query, update, options);*/
} }
} }
console.log("Finished Shifting Talkgroup Stats at: " + new Date()); //console.log("Finished Shifting Talkgroup Stats at: " + new Date());
updateActiveSystems(); updateActiveSystems();
console.log("Finished Updating Active Systems at: " + new Date()); //console.log("Finished Updating Active Systems at: " + new Date());
} }
exports.siteStats = function(req, res) { exports.siteStats = function (req, res) {
const siteStats ={ const siteStats = {
uploadsPerMin, uploadsPerMin,
activeSystems, activeSystems,
totalClients: req.totalClients totalClients: req.totalClients