From 7322b315bbf1f2b1ae381c3a986d4730275e8fc8 Mon Sep 17 00:00:00 2001
From: David Tisza <36048547+dtisza1@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:18:03 -0400
Subject: [PATCH] UPLOAD-1388: Default to tusd in-memory locker, if Redis is
 not available at startup (#394)

* Update to not fail startup if no Redis

* Improve error messaging
---
 upload-server/cmd/cli/serve.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/upload-server/cmd/cli/serve.go b/upload-server/cmd/cli/serve.go
index 84db34e2a..aa7df4bf2 100644
--- a/upload-server/cmd/cli/serve.go
+++ b/upload-server/cmd/cli/serve.go
@@ -50,17 +50,16 @@ func Serve(appConfig appconfig.AppConfig) (http.Handler, error) {
 		var err error
 		locker, err = redislocker.New(appConfig.TusRedisLockURI, redislocker.WithLogger(logger))
 		if err != nil {
-			logger.Error("error configuring redis locker", "error", err)
-			return nil, err
+			logger.Error("failed to configure Redis locker, defaulting to in-memory locker", "error", err)
 		}
-		// redislocker health check
+
+		// configure redislocker health check
 		redisLockerHealth, err := redislockerhealth.New(appConfig.TusRedisLockURI)
 		if err != nil {
-			logger.Error("error configuring redis locker health check: ", "error", err)
-			return nil, err
+			logger.Error("failed to configure Redis locker health check, skipping check", "error", err)
+		} else {
+			health.Register(redisLockerHealth)
 		}
-
-		health.Register(redisLockerHealth)
 	}
 
 	// get and initialize tusd hook handlers