add fs to deps

seroanalytics · Sep 3, 2024 · 2417f12 · 2417f12
1 parent c46b094
commit 2417f12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,6 +13,7 @@ Imports:
     base64enc,
     cachem,
     docopt,
+    fs,
     jsonlite,
     logger,
     mgcv,
@@ -24,7 +25,6 @@ Imports:
 Remotes:
     hillalex/porcelain@i39,
 Suggests:
-    fs,
     lintr (>= 3.1.2),
     readr,
     Rook,

diff --git a/R/main.R b/R/main.R
@@ -10,6 +10,7 @@ Options:
 
 
 main <- function(args = commandArgs(TRUE)) {
+  options(error = rlang::entrace)
   opts <- main_args(args)
   port <- opts$port
   logger::log_info("Starting API")

diff --git a/R/router.R b/R/router.R
@@ -13,11 +13,16 @@ build_routes <- function(cookie_key = plumber::random_cookie_key(),
       res$setHeader("Access-Control-Allow-Credentials", "true")
     }
 
-    if (!is.null(req$session$id)) {
-      id <- as.character(req$session$id)
-      cache$set(id, TRUE)
-    }
-    prune_inactive_sessions(cache)
+    tryCatch({
+      if (!is.null(req$session$id)) {
+        logger::log_info("Updating session cache")
+        id <- as.character(req$session$id)
+        cache$set(id, TRUE)
+      }
+      logger::log_info("Looking for inactive sessions")
+      prune_inactive_sessions(cache)
+    }, error = function(e) logger::log_error(conditionMessage(e)))
+
     value
   })
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -15,6 +15,7 @@ RUN install_packages --repo=https://mrc-ide.r-universe.dev \
         cachem \
         callr \
         docopt \
+        fs \
         logger \
         jsonlite \
         jsonvalidate \