Improved logging & add graphicsmagick to docker file.

.env.development

@@ -1,2 +1,3 @@
 MEDIA_PATH=~/Desktop/IMS
-PORT=8000
+PORT=8000
+IMS_TOKEN=development

Dockerfile

@@ -17,6 +17,7 @@ COPY . .
 
 RUN apt-get update && apt-get install -y \
     imagemagick \
+    graphicsmagick \
     ghostscript \
     && rm -rf /var/lib/apt/lists/*
 

bills/billsUploadMedia.ts

@@ -27,7 +27,9 @@ export const BillsMediaUploadMulter = multer({
       cb(null, DestinationFolder);
     },
     filename: function (req, file, cb) {
-      logger.info("Uploading file: ", path.basename(file.originalname));
+      logger.info("Uploading file: ", {
+        file: path.basename(file.originalname),
+      });
       const invoice_number: string = (req.body.invoice_number || "").trim();
 
       cb(null, generateUniqueBillFilename(file, invoice_number));
@@ -75,8 +77,11 @@ export async function BillsUploadMedia(req: Request, res: Response) {
 
       BillsListMedia(req, res);
     }
-  } catch (err) {
-    logger.error("Error while uploading Bill Media", req.files, err);
-    res.status(500).send(err);
+  } catch (error) {
+    logger.error("Error while uploading Bill Media", {
+      files: req.files,
+      error,
+    });
+    res.status(500).send(error);
   }
 }

jobs/jobsListMedia.ts

@@ -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);
   }
 }

jobs/jobsMoveMedia.ts

@@ -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);
   }
 }

jobs/jobsUploadMedia.ts

@@ -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);
   }
 }

util/generateThumbnail.ts

@@ -51,7 +51,7 @@ export default async function GenerateThumbnail(
     }
     return path.relative(path.dirname(file), thumbPath);
   } catch (err) {
-    logger.error("Error when genenerating thumbnail:", thumbPath, err);
+    logger.error("Error when genenerating thumbnail:", { thumbPath, err });
     return path.relative(path.dirname(file), thumbPath);
   }
 }

util/serverInit.ts

@@ -31,5 +31,5 @@ export default function InitServer() {
   logger.info(`Ensuring Vendors media path exists: ${FolderPaths.Vendors}`);
   fs.ensureDirSync(FolderPaths.Vendors);
   logger.info("Folder Paths", FolderPaths);
-  logger.info("IMS Token set to:", (process.env.IMS_TOKEN || "").trim());
+  logger.info("IMS Token set to: " + (process.env.IMS_TOKEN || "").trim());
 }