From 6edfc1cb22123ab73713801ff607348753a6cda1 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 31 Aug 2022 10:14:32 +0100 Subject: [PATCH] Try again --- cmd/dendrite-demo-pinecone/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index a3cc951a9..d1dd2e602 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -91,7 +91,7 @@ func main() { keyfile := *instanceName + ".pem" if _, err := os.Stat(keyfile); os.IsNotExist(err) { oldkeyfile := *instanceName + ".key" - if _, err := os.Stat(oldkeyfile); os.IsNotExist(err) { + if _, err = os.Stat(oldkeyfile); os.IsNotExist(err) { if err = test.NewMatrixKey(keyfile); err != nil { panic("failed to generate a new PEM key: " + err.Error()) } @@ -106,12 +106,13 @@ func main() { panic("failed to convert the private key to PEM format: " + err.Error()) } } + } else { + var err error + if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { + panic(err) + } } - var err error cfg.Defaults(true) - if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil { - panic(err) - } cfg.Global.PrivateKey = sk cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", *instanceName)) cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-account.db", *instanceName))