Simplified Repeat Request Methods

vehicle/saic/api.go

@@ -55,7 +55,7 @@ func NewAPI(log *util.Logger, identity *Identity) *API {
 	return v
 }
 
-func (v *API) doRepeatedRequest(baseUrl string, path string, event_id string) error {
+func (v *API) doRepeatedRequest(path string, event_id string) error {
 	var req *http.Request
 
 	answer := requests.Answer{
@@ -69,7 +69,7 @@ func (v *API) doRepeatedRequest(baseUrl string, path string, event_id string) er
 	}
 
 	req, err = requests.CreateRequest(
-		baseUrl,
+		v.identity.baseUrl,
 		path,
 		http.MethodGet,
 		"",
@@ -91,15 +91,15 @@ func (v *API) doRepeatedRequest(baseUrl string, path string, event_id string) er
 }
 
 // This is running concurrently
-func (v *API) repeatRequest(baseUrl string, path string, event_id string) {
+func (v *API) repeatRequest(path string, event_id string) {
 	var err error
 	var count int
 
 	v.request.Status = StatRunning
 	for err = api.ErrMustRetry; err == api.ErrMustRetry && count < 20; {
 		time.Sleep(2 * time.Second)
 		v.Logger.DEBUG.Printf("Starting repeated query. Count: %d\n", count)
-		err = v.doRepeatedRequest(baseUrl, path, event_id)
+		err = v.doRepeatedRequest(path, event_id)
 		count++
 	}
 
@@ -252,7 +252,7 @@ func (v *API) Status(vin string) (requests.ChargeStatus, error) {
 	if err == api.ErrMustRetry {
 		v.request.Status = StatRunning
 		v.Logger.DEBUG.Printf(" No answer yet. Continue status query in background\n")
-		go v.repeatRequest(v.identity.baseUrl, path, event_id)
+		go v.repeatRequest(path, event_id)
 	} else if err != nil {
 		v.Logger.ERROR.Printf("doRequest failed with %s", err.Error())
 	}