Improved logging & add graphicsmagick to docker file.

This commit is contained in:
Patrick Fic
2022-05-12 16:30:15 -07:00
parent 539d35203e
commit fc37f09e6b
8 changed files with 25 additions and 20 deletions

View File

@@ -11,7 +11,7 @@ import { FolderPaths } from "../util/serverInit";
export async function JobsListMedia(req: Request, res: Response) {
const jobid: string = (req.body.jobid || "").trim();
await fs.ensureDir(PathToRoFolder(jobid));
logger.debug("Listing media for job.", PathToRoFolder(jobid));
logger.debug("Listing media for job: " + PathToRoFolder(jobid));
let ret: MediaFile[];
try {
if (req.files) {
@@ -75,7 +75,7 @@ export async function JobsListMedia(req: Request, res: Response) {
res.json(ret);
} catch (error) {
logger.error("Error listing job media.", jobid, error);
logger.error("Error listing job media.", { jobid, error });
res.status(500).json(error);
}
}

View File

@@ -57,16 +57,12 @@ export async function JobsMoveMedia(req: Request, res: Response) {
JobsListMedia(req, res);
} catch (err) {
logger.error(
"Error moving job media",
"from",
logger.error("Error moving job media", {
from_jobid,
"to",
jobid,
"files",
files,
err
);
err,
});
res.status(500).send(err);
}
}

View File

@@ -17,7 +17,9 @@ export const JobMediaUploadMulter = multer({
cb(null, DestinationFolder);
},
filename: function (req, file, cb) {
logger.debug("Uploading file: ", path.basename(file.originalname));
logger.debug("Uploading file: ", {
file: path.basename(file.originalname),
});
cb(null, generateUniqueFilename(file));
},
}),
@@ -48,8 +50,8 @@ export async function jobsUploadMedia(req: Request, res: Response) {
JobsListMedia(req, res);
}
} catch (err) {
logger.error("Error uploading job media.", jobid, err);
res.status(500).send(err);
} catch (error) {
logger.error("Error uploading job media.", { jobid, error: error });
res.status(500).send(error);
}
}