From b30009cace90dcdfe93cf14f80c81f21c0f3bccc Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Wed, 20 Apr 2022 22:57:52 +0000
Subject: [PATCH] Fix backup trigger call on uninitialized object
---
api/client.go | 2 +-
backup/backup.go | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/api/client.go b/api/client.go
index 0c775b99e..685e7dca2 100644
--- a/api/client.go
+++ b/api/client.go
@@ -752,7 +752,7 @@ func (c *Client) GetNodeRegistrationStatus() (int, int, error) {
"registrations when network is not healthy")
}
- nodes := c.network.GetInstance().GetFullNdf().Get().Nodes
+ nodes := c.network.GetInstance().GetPartialNdf().Get().Nodes
var numRegistered int
var numStale = 0
diff --git a/backup/backup.go b/backup/backup.go
index b36b297df..f4f1c19ee 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -197,6 +197,11 @@ func (b *Backup) TriggerBackup(reason string) {
b.mux.RLock()
defer b.mux.RUnlock()
+ if b == nil || b.kv == nil {
+ jww.ERROR.Printf("TriggerBackup called on unitialized object")
+ return
+ }
+
key, salt, params, err := loadBackup(b.kv)
if err != nil {
jww.ERROR.Printf("Backup Failed: could not load key, salt, and "+
--
GitLab