summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-02-14 15:06:06 +0100
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-04-05 12:26:12 +0200
commitab0505d8eee495df3311194ead5a84ec78131025 (patch)
tree3c947f226d6dd94af71e3a4df7c436409ca278ef
parent0f5ae9a05b71545f34acde15f50536ff80da4ac0 (diff)
Go: Properly expose getting server list
Signed-off-by: jwijenbergh <jeroenwijenbergh@protonmail.com>
-rw-r--r--exports/exports.go2
-rw-r--r--src/server.go6
2 files changed, 6 insertions, 2 deletions
diff --git a/exports/exports.go b/exports/exports.go
index 9f2d83a..3efc820 100644
--- a/exports/exports.go
+++ b/exports/exports.go
@@ -24,7 +24,7 @@ func GetOrganizationsList() (*C.char, int8) {
// Returns the json data as a string and an error code. This is used as key for looking up data.
//export GetServersList
func GetServersList() (*C.char, int8) {
- body, err := eduvpn.GetOrganizationsList()
+ body, err := eduvpn.GetServersList()
if err != nil {
return nil, int8(err.(eduvpn.RequestError).Code)
}
diff --git a/src/server.go b/src/server.go
index 7fe3735..e878a08 100644
--- a/src/server.go
+++ b/src/server.go
@@ -71,7 +71,11 @@ func GetOrganizationsList() (string, error) {
// Get the server list
func GetServersList() (string, error) {
- return getDiscoFile("server_list.json")
+ body, err := getDiscoFile("server_list.json")
+ if err != nil {
+ return "", err.(detailedRequestError).ToRequestError()
+ }
+ return body, nil
}
// RequestErrorCode Simplified error code for public interface.