linting the code

This commit is contained in:
9seconds
2019-10-11 09:41:18 +03:00
parent 432e2970a0
commit 5009859a1e
50 changed files with 172 additions and 55 deletions
+6 -3
View File
@@ -31,34 +31,36 @@ func getAddresses(url string) (map[conntypes.DC][]string, conntypes.DC, error) {
if err != nil {
return nil, 0, fmt.Errorf("cannot get http response: %w", err)
}
defer resp.Close()
scanner := bufio.NewScanner(resp)
data := map[conntypes.DC][]string{}
defaultDC := conntypes.DCDefaultIdx
var defaultDC = conntypes.DCDefaultIdx
for scanner.Scan() {
text := strings.TrimSpace(scanner.Text())
switch {
case strings.HasPrefix(text, "#"):
continue
case strings.HasPrefix(text, "proxy_for"):
addr, idx, err := addressesParseProxyFor(text)
if err != nil {
return nil, 0, fmt.Errorf("cannot parse 'proxy_for' section: %w", err)
}
if addresses, ok := data[idx]; ok {
data[idx] = append(addresses, addr)
} else {
data[idx] = []string{addr}
}
case strings.HasPrefix(text, "default"):
idx, err := addressesParseDefault(text)
if err != nil {
return nil, 0, fmt.Errorf("cannot parse 'default' section: %w", err)
}
defaultDC = idx
}
}
@@ -97,6 +99,7 @@ func addressesParseDefault(text string) (conntypes.DC, error) {
}
dcString := strings.TrimRight(chunks[1], ";")
dc, err := strconv.ParseInt(dcString, 10, 16)
if err != nil {
return 0, fmt.Errorf("incorrect config '%s': %w", text, err)
+3 -1
View File
@@ -22,15 +22,17 @@ func request(url string) (io.ReadCloser, error) {
if err != nil {
panic(err)
}
req.Header.Set("Accept", "text/plan")
req.Header.Set("User-Agent", apiUserAgent)
resp, err := httpClient.Do(req)
if err != nil {
if resp != nil {
io.Copy(ioutil.Discard, resp.Body)
io.Copy(ioutil.Discard, resp.Body) // nolint: errcheck
resp.Body.Close()
}
return nil, fmt.Errorf("cannot perform a request: %w", err)
}
+1
View File
@@ -12,6 +12,7 @@ func Secret() ([]byte, error) {
if err != nil {
return nil, fmt.Errorf("cannot access telegram server: %w", err)
}
defer resp.Close()
secret, err := ioutil.ReadAll(resp)
+1 -1
View File
@@ -51,7 +51,7 @@ func (b *baseTelegram) chooseAddress(addresses map[conntypes.DC][]string,
dc, defaultDC conntypes.DC) string {
addrs, ok := addresses[dc]
if !ok {
addrs, _ = addresses[defaultDC]
addrs = addresses[defaultDC]
}
switch {
+1
View File
@@ -55,6 +55,7 @@ func (m *middleTelegram) update() error {
func (m *middleTelegram) backgroundUpdate() {
logger := zap.S().Named("telegram")
for range time.Tick(middleTelegramBackgroundUpdateEvery) {
if err := m.update(); err != nil {
logger.Warnw("Cannot update Telegram proxies", "error", err)