Fixed timeout issue

Author: meafmira

upcloud/client/client.go

@@ -3,12 +3,12 @@ package client
 import (
 	"bytes"
 	"fmt"
-	"github.com/blang/semver"
-	"github.com/hashicorp/go-cleanhttp"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"time"
+
+	"github.com/blang/semver"
 )
 
 // Constants
@@ -50,6 +50,11 @@ func (c *Client) SetTimeout(timeout time.Duration) {
 	c.httpClient.Timeout = timeout
 }
 
+// GetTimeout returns current timeout
+func (c *Client) GetTimeout() time.Duration {
+	return c.httpClient.Timeout
+}
+
 // CreateRequestUrl creates and returns a complete request URL for the specified API location
 func (c *Client) CreateRequestUrl(location string) string {
 	return fmt.Sprintf("%s%s", c.getBaseUrl(), location)

upcloud/service/service.go

@@ -3,10 +3,11 @@ package service
 import (
 	"encoding/xml"
 	"fmt"
+	"time"
+
 	"github.com/UpCloudLtd/upcloud-go-api/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/upcloud/client"
 	"github.com/UpCloudLtd/upcloud-go-api/upcloud/request"
-	"time"
 )
 
 // Service represents the API service. The specified client is used to communicate with the API
@@ -185,12 +186,18 @@ func (s *Service) WaitForServerState(r *request.WaitForServerStateRequest) (*upc
 
 // StartServer starts the specified server
 func (s *Service) StartServer(r *request.StartServerRequest) (*upcloud.ServerDetails, error) {
+	// Save previous timeout
+	prevTimeout := s.client.GetTimeout()
+
 	// Increase the client timeout to match the request timeout
 	s.client.SetTimeout(r.Timeout)
 
 	serverDetails := upcloud.ServerDetails{}
 	response, err := s.client.PerformPostRequest(s.client.CreateRequestUrl(r.RequestURL()), nil)
 
+	// Restore previous timout
+	s.client.SetTimeout(prevTimeout)
+
 	if err != nil {
 		return nil, parseServiceError(err)
 	}