From 27ce787fbd068fb9fe2138be267b58b654ca5206 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Wed, 15 Sep 2021 09:21:41 -0700
Subject: [PATCH] fix central docker launch without redis

---
 ext/central-controller-docker/main.sh | 2 +-
 service/OneService.cpp                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/central-controller-docker/main.sh b/ext/central-controller-docker/main.sh
index 7a1086907..3a625ede5 100755
--- a/ext/central-controller-docker/main.sh
+++ b/ext/central-controller-docker/main.sh
@@ -50,7 +50,7 @@ if [ "$ZT_USE_REDIS" == "true" ]; then
         }
     "
 else
-    REDIS="\"redis\": {}"
+    REDIS="\"redis\": null"
 fi
 
 mkdir -p /var/lib/zerotier-one
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 4dfe1bb79..dbbac3560 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1071,7 +1071,7 @@ public:
 			if (redis.is_object() && _rc == NULL) {
 				_rc = new RedisConfig;
 				_rc->hostname = OSUtils::jsonString(redis["hostname"],"");
-				_rc->port = redis["port"];
+				_rc->port = OSUtils::jsonInt(redis["port"],0);
 				_rc->password = OSUtils::jsonString(redis["password"],"");
 				_rc->clusterMode = OSUtils::jsonBool(redis["clusterMode"], false);
 			}