diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/client.go | 7 | ||||
| -rw-r--r-- | client/server.go | 32 |
2 files changed, 14 insertions, 25 deletions
diff --git a/client/client.go b/client/client.go index da765c1..103136b 100644 --- a/client/client.go +++ b/client/client.go @@ -1,7 +1,6 @@ package client import ( - "fmt" "strings" "github.com/eduvpn/eduvpn-common/internal/config" @@ -129,11 +128,11 @@ func (client *Client) Register( // Check if we are able to fetch discovery, and log if something went wrong _, discoServersErr := client.GetDiscoServers() if discoServersErr != nil { - client.Logger.Warning(fmt.Sprintf("Failed to get discovery servers: %v", discoServersErr)) + client.Logger.Warning("Failed to get discovery servers: %v", discoServersErr) } _, discoOrgsErr := client.GetDiscoOrganizations() if discoOrgsErr != nil { - client.Logger.Warning(fmt.Sprintf("Failed to get discovery organizations: %v", discoOrgsErr)) + client.Logger.Warning("Failed to get discovery organizations: %v", discoOrgsErr) } return nil @@ -147,7 +146,7 @@ func (client *Client) Deregister() { // Save the config saveErr := client.Config.Save(&client) if saveErr != nil { - client.Logger.Info(fmt.Sprintf("failed saving configuration, error: %s", types.GetErrorTraceback(saveErr))) + client.Logger.Info("failed saving configuration, error: %s", types.GetErrorTraceback(saveErr)) } // Empty out the state diff --git a/client/server.go b/client/server.go index 5e1c31f..3bcecc6 100644 --- a/client/server.go +++ b/client/server.go @@ -83,7 +83,7 @@ func (client *Client) getConfig( // This is best effort endpointErr := server.RefreshEndpoints(chosenServer) if endpointErr != nil { - client.Logger.Warning(fmt.Sprintf("failed to refresh server endpoints: %v", endpointErr)) + client.Logger.Warning("failed to refresh server endpoints: %v", endpointErr) } config, configType, configErr := client.retryConfigAuth(chosenServer, preferTCP) @@ -103,10 +103,8 @@ func (client *Client) getConfig( saveErr := client.Config.Save(&client) if saveErr != nil { client.Logger.Info( - fmt.Sprintf( - "Failed saving configuration after getting a server: %s", - types.GetErrorTraceback(saveErr), - ), + "Failed saving configuration after getting a server: %s", + types.GetErrorTraceback(saveErr), ) } @@ -154,10 +152,8 @@ func (client *Client) RemoveSecureInternet() error { saveErr := client.Config.Save(&client) if saveErr != nil { client.Logger.Info( - fmt.Sprintf( - "Failed saving configuration after removing a secure internet server: %s", - types.GetErrorTraceback(saveErr), - ), + "Failed saving configuration after removing a secure internet server: %s", + types.GetErrorTraceback(saveErr), ) } return nil @@ -180,10 +176,8 @@ func (client *Client) RemoveInstituteAccess(url string) error { saveErr := client.Config.Save(&client) if saveErr != nil { client.Logger.Info( - fmt.Sprintf( - "Failed saving configuration after removing an institute access server: %s", - types.GetErrorTraceback(saveErr), - ), + "Failed saving configuration after removing an institute access server: %s", + types.GetErrorTraceback(saveErr), ) } return nil @@ -206,10 +200,8 @@ func (client *Client) RemoveCustomServer(url string) error { saveErr := client.Config.Save(&client) if saveErr != nil { client.Logger.Info( - fmt.Sprintf( - "Failed saving configuration after removing a custom server: %s", - types.GetErrorTraceback(saveErr), - ), + "Failed saving configuration after removing a custom server: %s", + types.GetErrorTraceback(saveErr), ) } return nil @@ -569,10 +561,8 @@ func (client *Client) ShouldRenewButton() bool { if currentServerErr != nil { client.Logger.Info( - fmt.Sprintf( - "No server found to renew with err: %s", - types.GetErrorTraceback(currentServerErr), - ), + "No server found to renew with err: %s", + types.GetErrorTraceback(currentServerErr), ) return false } |