From d67bbe77cabc70c489d8fc4ab66e5ac423911906 Mon Sep 17 00:00:00 2001
From: jaketaylor <jake@privategrity.com>
Date: Wed, 12 Feb 2020 17:04:40 -0800
Subject: [PATCH] revert bad fix
---
cmd/root.go | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/cmd/root.go b/cmd/root.go
index b7341cf..38e8a0d 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -57,16 +57,10 @@ var rootCmd = &cobra.Command{
certPath := viper.GetString("certPath")
keyPath := viper.GetString("keyPath")
localAddress := fmt.Sprintf("0.0.0.0:%d", viper.GetInt("port"))
- fbCreds, err := utils.ExpandPath(
- viper.GetString("firebaseCredentialsPath"))
+ fbCreds, err := utils.ExpandPath(viper.GetString("firebaseCredentialsPath"))
if err != nil {
jww.FATAL.Panicf("Unable to expand credentials path: %+v", err)
}
- permissioningCert, err := utils.ExpandPath(
- viper.GetString("permissioningCertPath"))
- if err != nil {
- jww.FATAL.Panicf("Unable to expand permissioning certificate path: %+v", err)
- }
// Populate params
NotificationParams = notifications.Params{
@@ -92,8 +86,7 @@ var rootCmd = &cobra.Command{
)
// Set up the notifications server connections
- err = setupConnection(impl, permissioningCert,
- viper.GetString("permissioningAddress"))
+ err = setupConnection(impl, viper.GetString("permissioningCertPath"), viper.GetString("permissioningAddress"))
if err != nil {
jww.FATAL.Panicf("Failed to set up connections: %+v", err)
}
--
GitLab