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

Merge branch 'system-test' into better-honeycomb

Browse Source
This commit is contained in:
Luke Berndt
2024-08-20 11:25:32 -04:00
committed by GitHub
parent bbbd4e1819 32af2ca734
commit be11cd2006
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/controllers/uploads.js
View File

@@ -14,7 +14,7 @@ const { NodeHttpHandler } = require('@smithy/node-http-handler');
const https = require('https');
const agent = new https.Agent({
maxSockets: 150
maxSockets: 250
});
@@ -22,7 +22,7 @@ var s3_endpoint = process.env['S3_ENDPOINT'] != null ? process.env['S3_ENDPOINT'
var s3_region = process.env['S3_REGION'] != null ? process.env['S3_REGION'] : 'us-west-1';
var s3_bucket = process.env['S3_BUCKET'] != null ? process.env['S3_BUCKET'] : 'openmhz-west';
var s3_profile = process.env['S3_PROFILE'] != null ? process.env['S3_PROFILE'] : 'wasabi-account';
var s3_public_url = process.env['S3_PUBLIC_URL'] != null ? process.env['S3_PUBLIC_URL'] : s3_endpoint + "/" + s3_bucket;
const client = new S3Client({
requestHandler: new NodeHttpHandler({
@@ -192,7 +192,7 @@ exports.upload = async function (req, res, next) {
var endpoint = s3_endpoint;
var bucket = s3_bucket;
var url = s3_endpoint + "/" + s3_bucket + "/" + object_key;
var url = s3_public_url + "/" + object_key;
call = new Call({
shortName: shortName,
@@ -268,10 +268,6 @@ exports.upload = async function (req, res, next) {
req.call = call.toObject();
next();
}
fs.unlinkSync(req.file.path);
} catch (err) {
saveSpan.recordException(err);
saveSpan.setStatus({