GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-14 17:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

its working

Browse Source
This commit is contained in:
Luke Berndt
2024-08-21 21:41:57 -04:00
parent 0e6e69c56e
commit 00dbc4725e
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
backend/controllers/uploads.js
View File

@@ -56,7 +56,7 @@ exports.upload = async function (req, res, next) {
} }
// Extract and parse request data // Extract and parse request data
const parseSpan = tracer.startSpan('parse_request_data');
var shortName = req.params.shortName.toLowerCase(); var shortName = req.params.shortName.toLowerCase();
var apiKey = req.body.api_key; var apiKey = req.body.api_key;
@@ -91,15 +91,11 @@ exports.upload = async function (req, res, next) {
} }
parseSpan.end(); parseSpan.end();
let item = null; let item = null;
console.log("Finished parsing request data");
// Validate that the system exists and the API key is correct // Validate that the system exists and the API key is correct
const validateSpan = tracer.startSpan("validate_system"); const validateSpan = tracer.startSpan("validate_system");
try { try {
item = await System.findOne({ 'shortName': shortName }, ["key", "ignoreUnknownTalkgroup"]); item = await System.findOne({ 'shortName': shortName }, ["key", "ignoreUnknownTalkgroup"]);
validateSpan.setAttribute('system.exists', !!item); validateSpan.setAttribute('system.exists', !!item);
@@ -111,7 +107,7 @@ exports.upload = async function (req, res, next) {
message: "ShortName does not exist", message: "ShortName does not exist",
}); });
console.info("[" + req.params.shortName + "] Error /:shortName/upload ShortName does not exist"); console.warn("[" + req.params.shortName + "] Error /:shortName/upload ShortName does not exist");
res.status(500); res.status(500);
res.send("ShortName does not exist: " + shortName + "\n"); res.send("ShortName does not exist: " + shortName + "\n");
return; return;
@@ -138,8 +134,6 @@ exports.upload = async function (req, res, next) {
validateSpan.end(); validateSpan.end();
} }
console.log("Finished validating system API key");
// Blocking sensitive talkgroups // Blocking sensitive talkgroups
const sensitiveSpan = tracer.startSpan("check_sensitive_talkgroups"); const sensitiveSpan = tracer.startSpan("check_sensitive_talkgroups");
if ((shortName == "hennearmer") && ((talkgroupNum == 3421) || (talkgroupNum == 3423))) { if ((shortName == "hennearmer") && ((talkgroupNum == 3421) || (talkgroupNum == 3423))) {
@@ -147,14 +141,11 @@ exports.upload = async function (req, res, next) {
code: opentelemetry.SpanStatusCode.ERROR, code: opentelemetry.SpanStatusCode.ERROR,
message: "Sensitive Talkgroup", message: "Sensitive Talkgroup",
}); });
//res.status(200).end(); res.status(200).end();
return; return;
} }
sensitiveSpan.end(); sensitiveSpan.end();
console.log("Finished checking sensitive talkgroups");
if (item.ignoreUnknownTalkgroup == true) { if (item.ignoreUnknownTalkgroup == true) {
const talkgroupSpan = tracer.startSpan("check_talkgroup_exists"); const talkgroupSpan = tracer.startSpan("check_talkgroup_exists");
talkgroupExists = await Talkgroup.exists({ talkgroupExists = await Talkgroup.exists({
@@ -167,20 +158,16 @@ exports.upload = async function (req, res, next) {
fs.unlinkSync(req.file.path) fs.unlinkSync(req.file.path)
//file removed //file removed
} catch (err) { } catch (err) {
console.log("[" + call.shortName + "] error deleting: " + req.file.path); console.error("[" + call.shortName + "] error deleting: " + req.file.path);
} }
res.status(500); res.status(500);
res.send("Talkgroup does not exist, skipping.\n"); res.send("Talkgroup does not exist, skipping.\n");
return; return;
} }
talkgroupSpan.end(); talkgroupSpan.end();
} }
console.log("Finished checking talkgroup exists");
res.status(200).end();
// Prepare call object // Prepare call object
let call; let call;
@@ -225,8 +212,6 @@ exports.upload = async function (req, res, next) {
prepareSpan.setAttribute('call.url', url); prepareSpan.setAttribute('call.url', url);
prepareSpan.end(); prepareSpan.end();
console.log("Finished preparing call object");
let fileContent; let fileContent;
// Upload file to S3 // Upload file to S3
const uploadSpan = tracer.startSpan('upload_to_s3'); const uploadSpan = tracer.startSpan('upload_to_s3');
@@ -253,8 +238,6 @@ exports.upload = async function (req, res, next) {
uploadSpan.end(); uploadSpan.end();
} }
console.log("Finished uploading to S3");
// Save call to database // Save call to database
const saveSpan = tracer.startSpan('save_call'); const saveSpan = tracer.startSpan('save_call');
@@ -277,8 +260,6 @@ exports.upload = async function (req, res, next) {
saveSpan.end(); saveSpan.end();
} }
console.log("Finished saving call to database");
// Clean up temporary file // Clean up temporary file
const cleanupSpan = tracer.startSpan('cleanup_temp_file'); const cleanupSpan = tracer.startSpan('cleanup_temp_file');
@@ -294,6 +275,7 @@ exports.upload = async function (req, res, next) {
} catch (error) { } catch (error) {
console.error("Error processing call upload: " + error);
span.recordException(error); span.recordException(error);
span.setStatus({ span.setStatus({
code: opentelemetry.SpanStatusCode.ERROR, code: opentelemetry.SpanStatusCode.ERROR,
@@ -302,7 +284,5 @@ exports.upload = async function (req, res, next) {
} finally { } finally {
span.end(); span.end();
} }
console.log("Finished processing call upload");
}); });
}; };