From 915d6abfbb947c8ddf252aba011d4dae9a19f9e1 Mon Sep 17 00:00:00 2001 From: Steven Tracey Date: Thu, 6 Jul 2023 13:21:25 -0400 Subject: [PATCH] Last Day --- ezconf | 2 +- main.go | 5 +---- serverconnection.go | 7 ++++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ezconf b/ezconf index 50f3ea1..59d788f 160000 --- a/ezconf +++ b/ezconf @@ -1 +1 @@ -Subproject commit 50f3ea10db20675313a7107665a49aa3135813ec +Subproject commit 59d788f042f68404af556bff52ba232367d1b406 diff --git a/main.go b/main.go index a52e8a7..1c579f5 100644 --- a/main.go +++ b/main.go @@ -14,10 +14,7 @@ var Config *ezconf.Configuration var Connection *tls.Conn func main() { - Config.Load() - //Config = ezconf.NewConfiguration("./config.ini") - - Config.SetValue("Blah.blah.string", "asdfasdf") + Config = ezconf.NewConfiguration("./config.ini") //var err error //Connection, err = NewSFSConnection(Config.GetAsString("General.server"), Config.GetAsInt("General.port")) diff --git a/serverconnection.go b/serverconnection.go index db0d29f..3dc6166 100644 --- a/serverconnection.go +++ b/serverconnection.go @@ -65,7 +65,12 @@ func getPublicKey() { } defer out.Close() - resp, err := http.Get(Config.GetAsString("General.http-server") + "/public.cer") + serverAddr, err := Config.GetKey("General.http-server") + if err != nil { + fmt.Printf("Error getting key in config: %v", err) + os.Exit(1) + } + resp, err := http.Get(serverAddr.String() + "/public.cer") if err != nil { fmt.Printf("Error fetching public key: %v", err) os.Exit(1)