Merge branch ‘trh/gets’ of https://gitlab.cs.st-andrews.ac.uk/cs3099group-be-4/project-code into trh/gets

2 files changed, 6 insertions, 5 deletions

diff --git a/src/conversion/czi/czi.ts b/src/conversion/czi/czi.ts
index e56cae1..9d55805 100644
--- a/src/conversion/czi/czi.ts
+++ b/src/conversion/czi/czi.ts
@@ -21,11 +21,6 @@ const readFile = require('util').promisify(fs.readFile);
 const readdir = require('util').promisify(fs.readdir);
 const exists = require('util').promisify(fs.exists);
 
-const queueSize = profiler.metric({
-	name: "Queued Image Jobs",
-	agg_type: "sum",
-	value   : () => jobQueue.size
-})
 
 // Various constants for placing files and defining tiles
 let extractDirectory: string = "";
diff --git a/src/files.ts b/src/files.ts
index c4d86a8..e7e7805 100644
--- a/src/files.ts
+++ b/src/files.ts
@@ -23,6 +23,10 @@ const cache = require('redis').createClient();
 cache.on("error", function(err: any) {
 	logger.error("Redis_Error: " + err);
 })
+const imgQueueSize = profiler.counter({
+	name: "Queued Image Jobs",
+	agg_type: "sum"
+})
 
 const BASE_BASE: string = `/cs/scratch/${require("os").userInfo().username}/`
 const CONTENT_BASE_DIRECTORY: string = BASE_BASE + 'files';
@@ -405,6 +409,7 @@ export const views: {
 			if (!cacheHit) {
 				try {
 					let retMe: CZITileRequest;
+					imgQueueSize.inc();
 					if (file.originalMimetype.includes('tif') || file.originalMimetype.includes('leica')) {
 						retMe = await getSCNTile(
 							path(file.uuid, project.name, 'scalable_image') + '/',
@@ -428,6 +433,7 @@ export const views: {
 					} else {
 						throw new RequestError(400, "bad_tile_mimetype");
 					}
+					imgQueueSize.dec();
 					avgReqDuration.update(Date.now() - startTime)
 					cache.set(url, retMe.file_path);
 					cacheHit = retMe.file_path;