improve some logs and fix review comments

src/app.ts

@@ -12,6 +12,7 @@ import { router as downloadRouter } from "./routes/download";
 import { router as indexRouter } from "./routes/index";
 import { router as uploadRouter } from "./routes/upload";
 import { logger } from "@user-office-software/duo-logger";
+import { configureLogger } from "./common/configureLogger";
 
 const app = express();
 app.set("views", path.join(__dirname, "views"));
@@ -43,6 +44,13 @@ app.use("/zip_in_place", zipInPlaceRouter);
 app.use("/download", downloadRouter);
 app.use("/upload", uploadRouter);
 
+configureLogger(
+  config.graylogEnabled,
+  config.graylogServer,
+  config.graylogPort,
+  config.environment
+);
+
 // Delete all zip files in config.path_to_zipped_files older than one hour.
 const deleteZipFiles = () => {
   try {

src/auth.ts

@@ -2,6 +2,7 @@ import express from "express";
 import { config } from "./common/config";
 import jwtLib from "jsonwebtoken";
 import * as fs from "fs";
+import { logger } from "@user-office-software/duo-logger";
 
 export const hasFileAccess = (
   req: express.Request,
@@ -21,10 +22,7 @@ export const hasFileAccess = (
   let jwtDecoded: Global.JWT;
   const jwtToken = req.body.jwt || req.cookies.jwt || req.query.jwt;
   try {
-    jwtDecoded = jwtLib.verify(
-      jwtToken,
-      jwtSecret
-    ) as Global.JWT;
+    jwtDecoded = jwtLib.verify(jwtToken, jwtSecret) as Global.JWT;
   } catch (e) {
     return {
       hasAccess: false,
@@ -34,6 +32,9 @@ export const hasFileAccess = (
       fileNames: [],
     };
   }
+
+  logger.logInfo("Request user: ", { user: jwtDecoded.username });
+
   const authRequest: Global.AuthRequest = {
     jwt: jwtDecoded,
     endpoint: req.originalUrl,

src/common/config.ts

@@ -1,6 +1,5 @@
 import fs = require("fs");
 import path = require("path");
-import { configureLogger } from "./configureLogger";
 
 const configFilePath = path.resolve(__dirname, "../../config/config.json");
 const configBuffer: string = fs.readFileSync(configFilePath, {
@@ -9,10 +8,3 @@ const configBuffer: string = fs.readFileSync(configFilePath, {
 });
 
 export const config: Record<string, any> = JSON.parse(configBuffer);
-
-configureLogger(
-  config.graylogEnabled,
-  config.graylogServer,
-  config.graylogPort,
-  config.environment
-);

src/index.ts

@@ -12,12 +12,18 @@ server.listen(port);
 server.on("error", onError);
 server.on("listening", onListening);
 
+process.on("uncaughtException", (error) => {
+  logger.logException("Unhandled NODE exception", error);
+});
+
 /**
  * Event listener for HTTP server "error" event.
  */
 
 function onError(error: Record<string, unknown>) {
   if (error.syscall !== "listen") {
+    logger.logError("Error received ", error);
+
     throw error;
   }
   const bind = "Port " + port;

src/routes/zip.ts

@@ -13,14 +13,20 @@ export const router = express.Router();
  * Request zipping of files. Require directory:string and files:string[] in the request body
  */
 router.post("/", (req, res) => {
+  logger.logInfo("Request has been submitted", {
+    directory: req.body.directory,
+    fileNames: req.body.files,
+  });
+
   const { hasAccess, statusCode, error, directory, fileNames } = hasFileAccess(
     req,
     req.body.directory,
     req.body.files
   );
 
   if (!hasAccess) {
-    logger.logError("Error       : ", { statusCode, error });
+    logger.logError("Error: ", { statusCode, error });
+
     return res.render("error", { statusCode, error });
   }
   try {