Able to configure API request timeout, #1046

This commit is contained in:
Alexander Zobnin
2020-11-10 16:39:06 +03:00
parent 965216a607
commit 82819b20aa
6 changed files with 40 additions and 11 deletions

View File

@@ -9,6 +9,7 @@ import (
"io/ioutil"
"net/http"
"net/url"
"time"
"github.com/alexanderzobnin/grafana-zabbix/pkg/httpclient"
"github.com/bitly/go-simplejson"
@@ -31,14 +32,14 @@ type ZabbixAPI struct {
type ZabbixAPIParams = map[string]interface{}
// New returns new ZabbixAPI instance initialized with given URL or error.
func New(api_url string, dsInfo *backend.DataSourceInstanceSettings) (*ZabbixAPI, error) {
func New(dsInfo *backend.DataSourceInstanceSettings, timeout time.Duration) (*ZabbixAPI, error) {
apiLogger := log.New()
zabbixURL, err := url.Parse(api_url)
zabbixURL, err := url.Parse(dsInfo.URL)
if err != nil {
return nil, err
}
client, err := httpclient.GetHttpClient(dsInfo)
client, err := httpclient.GetHttpClient(dsInfo, timeout)
if err != nil {
return nil, err
}