summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-11-28 14:53:39 +0100
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-11-28 14:53:39 +0100
commit1a9e9080548c952cc81c01782eb9f01f6aed459e (patch)
tree7e23e063404f181a59405e628bab121402bd3fc5 /client
parent5c8886236a0f6fc2c7674f7132ec09a13b65564a (diff)
Log: Define f prefix for log functions to indicate printf like
Diffstat (limited to 'client')
-rw-r--r--client/client.go8
-rw-r--r--client/fsm.go10
-rw-r--r--client/server.go12
3 files changed, 15 insertions, 15 deletions
diff --git a/client/client.go b/client/client.go
index d6b04a3..1229a20 100644
--- a/client/client.go
+++ b/client/client.go
@@ -116,7 +116,7 @@ func (client *Client) Register(
// Try to load the previous configuration
if client.Config.Load(&client) != nil {
// This error can be safely ignored, as when the config does not load, the struct will not be filled
- client.Logger.Info("Previous configuration not found")
+ client.Logger.Infof("Previous configuration not found")
}
// Go to the No Server state with the saved servers after we're done
@@ -130,11 +130,11 @@ func (client *Client) Register(
// Check if we are able to fetch discovery, and log if something went wrong
_, discoServersErr := client.DiscoServers()
if discoServersErr != nil {
- client.Logger.Warning("Failed to get discovery servers: %v", discoServersErr)
+ client.Logger.Warningf("Failed to get discovery servers: %v", discoServersErr)
}
_, discoOrgsErr := client.DiscoOrganizations()
if discoOrgsErr != nil {
- client.Logger.Warning("Failed to get discovery organizations: %v", discoOrgsErr)
+ client.Logger.Warningf("Failed to get discovery organizations: %v", discoOrgsErr)
}
return nil
@@ -148,7 +148,7 @@ func (client *Client) Deregister() {
// Save the config
saveErr := client.Config.Save(&client)
if saveErr != nil {
- client.Logger.Info("failed saving configuration, error: %s", types.ErrorTraceback(saveErr))
+ client.Logger.Infof("failed saving configuration, error: %s", types.ErrorTraceback(saveErr))
}
// Empty out the state
diff --git a/client/fsm.go b/client/fsm.go
index 0effb2a..316dea4 100644
--- a/client/fsm.go
+++ b/client/fsm.go
@@ -274,7 +274,7 @@ func (client *Client) SetConnected() error {
errorMessage := "failed to set connected"
if client.InFSMState(StateConnected) {
// already connected, show no error
- client.Logger.Warning("Already connected")
+ client.Logger.Warningf("Already connected")
return nil
}
if !client.FSM.HasTransition(StateConnected) {
@@ -303,7 +303,7 @@ func (client *Client) SetConnecting() error {
errorMessage := "failed to set connecting"
if client.InFSMState(StateConnecting) {
// already loading connection, show no error
- client.Logger.Warning("Already connecting")
+ client.Logger.Warningf("Already connecting")
return nil
}
if !client.FSM.HasTransition(StateConnecting) {
@@ -332,7 +332,7 @@ func (client *Client) SetDisconnecting() error {
errorMessage := "failed to set disconnecting"
if client.InFSMState(StateDisconnecting) {
// already disconnecting, show no error
- client.Logger.Warning("Already disconnecting")
+ client.Logger.Warningf("Already disconnecting")
return nil
}
if !client.FSM.HasTransition(StateDisconnecting) {
@@ -362,7 +362,7 @@ func (client *Client) SetDisconnected(cleanup bool) error {
errorMessage := "failed to set disconnected"
if client.InFSMState(StateDisconnected) {
// already disconnected, show no error
- client.Logger.Warning("Already disconnected")
+ client.Logger.Warningf("Already disconnected")
return nil
}
if !client.FSM.HasTransition(StateDisconnected) {
@@ -394,7 +394,7 @@ func (client *Client) SetDisconnected(cleanup bool) error {
func (client *Client) goBackInternal() {
goBackErr := client.GoBack()
if goBackErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
fmt.Sprintf(
"Failed going back, error: %s",
types.ErrorTraceback(goBackErr),
diff --git a/client/server.go b/client/server.go
index 01f965a..f3a161b 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("failed to refresh server endpoints: %v", endpointErr)
+ client.Logger.Warningf("failed to refresh server endpoints: %v", endpointErr)
}
config, configType, configErr := client.retryConfigAuth(chosenServer, preferTCP)
@@ -102,7 +102,7 @@ func (client *Client) getConfig(
// Save the config
saveErr := client.Config.Save(&client)
if saveErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
"Failed saving configuration after getting a server: %s",
types.ErrorTraceback(saveErr),
)
@@ -151,7 +151,7 @@ func (client *Client) RemoveSecureInternet() error {
// Save the config
saveErr := client.Config.Save(&client)
if saveErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
"Failed saving configuration after removing a secure internet server: %s",
types.ErrorTraceback(saveErr),
)
@@ -175,7 +175,7 @@ func (client *Client) RemoveInstituteAccess(url string) error {
// Save the config
saveErr := client.Config.Save(&client)
if saveErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
"Failed saving configuration after removing an institute access server: %s",
types.ErrorTraceback(saveErr),
)
@@ -199,7 +199,7 @@ func (client *Client) RemoveCustomServer(url string) error {
// Save the config
saveErr := client.Config.Save(&client)
if saveErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
"Failed saving configuration after removing a custom server: %s",
types.ErrorTraceback(saveErr),
)
@@ -563,7 +563,7 @@ func (client *Client) ShouldRenewButton() bool {
currentServer, currentServerErr := client.Servers.GetCurrentServer()
if currentServerErr != nil {
- client.Logger.Info(
+ client.Logger.Infof(
"No server found to renew with err: %s",
types.ErrorTraceback(currentServerErr),
)