Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 6c523a3

Browse files
vania-poohvania-pooh
authored
Merge pull request #391 from vania-pooh/master
Switched to github.com/stretchr/testify in tests
2 parents 5fe0f6f + 73c4590 commit 6c523a3

File tree

6 files changed

+357
-328
lines changed

6 files changed

+357
-328
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $ cat /etc/grid-router/quota/test.xml
4343
</browser>
4444
</qa:browsers>
4545
```
46-
***Note***: file name should correspond to user name you added to htpasswd file. For user ```test``` we added on previous steps you should create ```test.xml```.
46+
***Note***: file name should correspond to username you added to htpasswd file. For user ```test``` we added on previous steps you should create ```test.xml```.
4747

4848
6) Start Ggr container:
4949
```

‎config_test.go

+57-57
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package main
22

33
import (
44
"fmt"
5+
assert "github.com/stretchr/testify/require"
56
"os"
67
"testing"
78

8-
. "github.com/aandryashin/matchers"
99
. "github.com/aerokube/ggr/config"
1010
)
1111

@@ -15,32 +15,32 @@ func init() {
1515

1616
func TestEmptyListOfHosts(t *testing.T) {
1717
host, index := choose(Hosts{})
18-
AssertThat(t, host, Is{(*Host)(nil)})
19-
AssertThat(t, index, EqualTo{-1})
18+
assert.Nil(t, host)
19+
assert.Equal(t, index, -1)
2020
}
2121

2222
func TestNothingToChoose(t *testing.T) {
2323
host, index := choose(Hosts{Host{Count: 0}, Host{Count: 0}})
24-
AssertThat(t, host, Is{(*Host)(nil)})
25-
AssertThat(t, index, EqualTo{-1})
24+
assert.Nil(t, host)
25+
assert.Equal(t, index, -1)
2626
}
2727

2828
func TestChooseFirst(t *testing.T) {
2929
host, index := choose(Hosts{Host{Name: "first", Count: 1}, Host{Name: "mid", Count: 0}, Host{Name: "last", Count: 0}})
30-
AssertThat(t, host.Name, EqualTo{"first"})
31-
AssertThat(t, index, EqualTo{0})
30+
assert.Equal(t, host.Name, "first")
31+
assert.Equal(t, index, 0)
3232
}
3333

3434
func TestChooseMid(t *testing.T) {
3535
host, index := choose(Hosts{Host{Name: "first", Count: 0}, Host{Name: "mid", Count: 1}, Host{Name: "last", Count: 0}})
36-
AssertThat(t, host.Name, EqualTo{"mid"})
37-
AssertThat(t, index, EqualTo{1})
36+
assert.Equal(t, host.Name, "mid")
37+
assert.Equal(t, index, 1)
3838
}
3939

4040
func TestChooseLast(t *testing.T) {
4141
host, index := choose(Hosts{Host{Name: "first", Count: 0}, Host{Name: "mid", Count: 0}, Host{Name: "last", Count: 1}})
42-
AssertThat(t, host.Name, EqualTo{"last"})
43-
AssertThat(t, index, EqualTo{2})
42+
assert.Equal(t, host.Name, "last")
43+
assert.Equal(t, index, 2)
4444
}
4545

4646
var (
@@ -92,84 +92,84 @@ var (
9292

9393
func TestFindDefaultVersion(t *testing.T) {
9494
hosts, version, _ := browsersWithMultipleVersions.find("browser", "", "", newSet(), newSet())
95-
AssertThat(t, version, EqualTo{"2.0"})
96-
AssertThat(t, len(hosts), EqualTo{1})
97-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0"})
95+
assert.Equal(t, version, "2.0")
96+
assert.Len(t, hosts, 1)
97+
assert.Equal(t, hosts[0].Name, "browser-2.0")
9898
}
9999

100100
func TestFindVersion(t *testing.T) {
101101
hosts, version, _ := browsersWithMultipleVersions.find("browser", "1.0", "LINUX", newSet(), newSet())
102-
AssertThat(t, version, EqualTo{"1.0"})
103-
AssertThat(t, len(hosts), EqualTo{1})
104-
AssertThat(t, hosts[0].Name, EqualTo{"browser-1.0"})
102+
assert.Equal(t, version, "1.0")
103+
assert.Len(t, hosts, 1)
104+
assert.Equal(t, hosts[0].Name, "browser-1.0")
105105
}
106106

107107
func TestFindVersionByPrefix(t *testing.T) {
108108
hosts, version, _ := browsersWithMultipleVersions.find("browser", "1", "", newSet(), newSet())
109-
AssertThat(t, version, EqualTo{"1.0"})
110-
AssertThat(t, len(hosts), EqualTo{1})
111-
AssertThat(t, hosts[0].Name, EqualTo{"browser-1.0"})
109+
assert.Equal(t, version, "1.0")
110+
assert.Len(t, hosts, 1)
111+
assert.Equal(t, hosts[0].Name, "browser-1.0")
112112
}
113113

114114
func TestVersionNotFound(t *testing.T) {
115115
hosts, version, _ := browsersWithMultipleVersions.find("browser", "missing", "", newSet(), newSet())
116-
AssertThat(t, version, EqualTo{"missing"})
117-
AssertThat(t, len(hosts), EqualTo{0})
116+
assert.Equal(t, version, "missing")
117+
assert.Empty(t, hosts)
118118
}
119119

120120
func TestFindWithExcludedRegions(t *testing.T) {
121121
hosts, version, _ := browsersWithMultipleRegions.find("browser", "1.0", "", newSet(), newSet("f"))
122-
AssertThat(t, version, EqualTo{"1.0"})
123-
AssertThat(t, len(hosts), EqualTo{1})
124-
AssertThat(t, hosts[0].Name, EqualTo{"browser-e-1.0"})
122+
assert.Equal(t, version, "1.0")
123+
assert.Len(t, hosts, 1)
124+
assert.Equal(t, hosts[0].Name, "browser-e-1.0")
125125
}
126126

127127
func TestFindWithExcludedRegionsExhausted(t *testing.T) {
128128
hosts, _, excludedRegions := browsersWithMultipleRegions.find("browser", "1.0", "", newSet(), newSet("e", "f"))
129-
AssertThat(t, len(hosts), EqualTo{2})
130-
AssertThat(t, excludedRegions.size(), EqualTo{0})
129+
assert.Len(t, hosts, 2)
130+
assert.Equal(t, excludedRegions.size(), 0)
131131
}
132132

133133
func TestFindWithExcludedHosts(t *testing.T) {
134134
hosts, version, _ := browsersWithMultipleRegions.find("browser", "1.0", "", newSet("browser-e-1.0:4444"), newSet())
135-
AssertThat(t, version, EqualTo{"1.0"})
136-
AssertThat(t, len(hosts), EqualTo{1})
137-
AssertThat(t, hosts[0].Name, EqualTo{"browser-f-1.0"})
135+
assert.Equal(t, version, "1.0")
136+
assert.Len(t, hosts, 1)
137+
assert.Equal(t, hosts[0].Name, "browser-f-1.0")
138138
}
139139

140140
func TestFindWithDefaultPlatform(t *testing.T) {
141141
hosts, version, _ := browsersWithMultiplePlatforms.find("browser", "2.0", "", newSet(), newSet())
142-
AssertThat(t, version, EqualTo{"2.0"})
143-
AssertThat(t, len(hosts), EqualTo{1})
144-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0-linux"})
142+
assert.Equal(t, version, "2.0")
143+
assert.Len(t, hosts, 1)
144+
assert.Equal(t, hosts[0].Name, "browser-2.0-linux")
145145
}
146146

147147
func TestFindWithAnyPlatform(t *testing.T) {
148148
hosts, version, _ := browsersWithMultiplePlatforms.find("browser", "2.0", "ANY", newSet(), newSet())
149-
AssertThat(t, version, EqualTo{"2.0"})
150-
AssertThat(t, len(hosts), EqualTo{1})
151-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0-linux"})
149+
assert.Equal(t, version, "2.0")
150+
assert.Len(t, hosts, 1)
151+
assert.Equal(t, hosts[0].Name, "browser-2.0-linux")
152152
}
153153

154154
func TestFindWithPlatform(t *testing.T) {
155155
hosts, version, _ := browsersWithMultiplePlatforms.find("browser", "2.0", "LINUX", newSet(), newSet())
156-
AssertThat(t, version, EqualTo{"2.0"})
157-
AssertThat(t, len(hosts), EqualTo{1})
158-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0-linux"})
156+
assert.Equal(t, version, "2.0")
157+
assert.Len(t, hosts, 1)
158+
assert.Equal(t, hosts[0].Name, "browser-2.0-linux")
159159
}
160160

161161
func TestFindWithPlatformLowercase(t *testing.T) {
162162
hosts, version, _ := browsersWithMultiplePlatforms.find("browser", "2.0", "windows", newSet(), newSet())
163-
AssertThat(t, version, EqualTo{"2.0"})
164-
AssertThat(t, len(hosts), EqualTo{1})
165-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0-windows"})
163+
assert.Equal(t, version, "2.0")
164+
assert.Len(t, hosts, 1)
165+
assert.Equal(t, hosts[0].Name, "browser-2.0-windows")
166166
}
167167

168168
func TestFindWithPlatformPrefix(t *testing.T) {
169169
hosts, version, _ := browsersWithMultiplePlatforms.find("browser", "2.0", "WIN", newSet(), newSet())
170-
AssertThat(t, version, EqualTo{"2.0"})
171-
AssertThat(t, len(hosts), EqualTo{1})
172-
AssertThat(t, hosts[0].Name, EqualTo{"browser-2.0-windows"})
170+
assert.Equal(t, version, "2.0")
171+
assert.Len(t, hosts, 1)
172+
assert.Equal(t, hosts[0].Name, "browser-2.0-windows")
173173
}
174174

175175
func TestReadNotExistingConfig(t *testing.T) {
@@ -184,8 +184,8 @@ func TestReadNotExistingConfig(t *testing.T) {
184184
var browsers Browsers
185185
err = readConfig(tmp.Name(), &browsers)
186186

187-
AssertThat(t, err, Is{Not{nil}})
188-
AssertThat(t, err.Error(), EqualTo{fmt.Sprintf("error reading configuration file %s: open %s: no such file or directory", tmp.Name(), tmp.Name())})
187+
assert.Error(t, err)
188+
assert.Equal(t, err.Error(), fmt.Sprintf("error reading configuration file %s: open %s: no such file or directory", tmp.Name(), tmp.Name()))
189189
}
190190

191191
func TestParseInvalidConfig(t *testing.T) {
@@ -205,8 +205,8 @@ func TestParseInvalidConfig(t *testing.T) {
205205
var browsers Browsers
206206
err = readConfig(tmp.Name(), &browsers)
207207

208-
AssertThat(t, err, Is{Not{nil}})
209-
AssertThat(t, err.Error(), EqualTo{fmt.Sprintf("error parsing configuration file %s: EOF", tmp.Name())})
208+
assert.Error(t, err)
209+
assert.Equal(t, err.Error(), fmt.Sprintf("error parsing configuration file %s: EOF", tmp.Name()))
210210
}
211211

212212
func TestParseConfig(t *testing.T) {
@@ -234,20 +234,20 @@ func testParseConfig(t *testing.T, config string) {
234234
var browsers Browsers
235235
err = readConfig(tmp.Name(), &browsers)
236236

237-
AssertThat(t, err, Is{nil})
238-
AssertThat(t, browsers.Browsers[0].Name, EqualTo{"browser"})
237+
assert.NoError(t, err)
238+
assert.Equal(t, browsers.Browsers[0].Name, "browser")
239239
}
240240

241241
func TestConfDirDoesNotExist(t *testing.T) {
242242
err := loadQuotaFiles("missing-dir")
243-
AssertThat(t, err, Is{Not{nil}})
243+
assert.Error(t, err)
244244
}
245245

246246
func TestConcurrentReload(t *testing.T) {
247247
go func() {
248-
loadQuotaFiles("quota")
248+
_ = loadQuotaFiles("quota")
249249
}()
250-
loadQuotaFiles("quota")
250+
_ = loadQuotaFiles("quota")
251251
}
252252

253253
func TestChoosingAllHosts(t *testing.T) {
@@ -258,7 +258,7 @@ func TestChoosingAllHosts(t *testing.T) {
258258
host, _ := choose(hosts)
259259
chosenHosts[host.Name]++
260260
}
261-
AssertThat(t, chosenHosts["first"] > 0, Is{true})
262-
AssertThat(t, chosenHosts["mid"] > 0, Is{true})
263-
AssertThat(t, chosenHosts["last"] > 0, Is{true})
261+
assert.True(t, chosenHosts["first"] > 0)
262+
assert.True(t, chosenHosts["mid"] > 0)
263+
assert.True(t, chosenHosts["last"] > 0)
264264
}

‎go.mod

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ module github.com/aerokube/ggr
33
go 1.21
44

55
require (
6-
github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e
76
github.com/aandryashin/reloader v0.0.0-20161127125235-da4f1b43ce40
87
github.com/abbot/go-http-auth v0.4.1-0.20220112235402-e1cee1c72f2f
8+
github.com/stretchr/testify v1.8.4
99
golang.org/x/net v0.19.0
1010
)
1111

1212
require (
13+
github.com/davecgh/go-spew v1.1.1 // indirect
1314
github.com/fsnotify/fsnotify v1.7.0 // indirect
15+
github.com/pmezard/go-difflib v1.0.0 // indirect
1416
golang.org/x/crypto v0.17.0 // indirect
1517
golang.org/x/sys v0.15.0 // indirect
18+
gopkg.in/yaml.v3 v3.0.1 // indirect
1619
)

‎go.sum

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e h1:ogUKYFNcdYUIBSLibE4+EjbTJazoHr5JsWWx21Lpn8c=
2-
github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e/go.mod h1:cbmYNkm9xeQlNoWEPtOUcvNok2gSD7ErMnYkRW+eHi8=
31
github.com/aandryashin/reloader v0.0.0-20161127125235-da4f1b43ce40 h1:zSKVi4h3Kv0HvNGjWPOsOEJIxtvd3PRMlVA/fcCB45g=
42
github.com/aandryashin/reloader v0.0.0-20161127125235-da4f1b43ce40/go.mod h1:gvg2/m9OQ4ZwK4Qk/mnfgokCb4qDN4BGyle+QGw4VOc=
53
github.com/abbot/go-http-auth v0.4.1-0.20220112235402-e1cee1c72f2f h1:R2ZVGCZzU95oXFJxncosHS9LsX8N4/MYUdGGWOb2cFk=
64
github.com/abbot/go-http-auth v0.4.1-0.20220112235402-e1cee1c72f2f/go.mod h1:l2P3JyHa+fjy5Bxol6y1u2o4DV/mv3QMBdBu2cNR53w=
7-
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
8-
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
5+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
97
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
108
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
9+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
11+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
12+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
1113
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1214
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
1315
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
1416
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
15-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
16-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
1717
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
1818
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
1919
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2020
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2221
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
2322
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2423
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
2524
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
2625
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
26+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
27+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
28+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
29+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎proxy.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func (c caps) capabilityJsonWireW3C(jsonWire, W3C string) string {
149149
return result
150150
}
151151

152-
func (c *caps) browser() string {
152+
func (c caps) browser() string {
153153
browserName := c.capability("browserName")
154154
if browserName != "" {
155155
return browserName
@@ -237,7 +237,7 @@ func session(ctx context.Context, h *Host, header http.Header, c caps) (map[stri
237237
func reply(w http.ResponseWriter, msg map[string]interface{}, status int) {
238238
w.Header().Set("Content-Type", "application/json")
239239
w.WriteHeader(status)
240-
json.NewEncoder(w).Encode(msg)
240+
_ = json.NewEncoder(w).Encode(msg)
241241
}
242242

243243
func serial() uint64 {
@@ -402,7 +402,7 @@ loop:
402402
}
403403

404404
func secondsSince(start time.Time) float64 {
405-
return float64(time.Now().Sub(start).Seconds())
405+
return time.Now().Sub(start).Seconds()
406406
}
407407

408408
func proxy(w http.ResponseWriter, r *http.Request) {
@@ -420,7 +420,7 @@ func proxy(w http.ResponseWriter, r *http.Request) {
420420
if ok {
421421
if r.Body != nil {
422422
if body, err := io.ReadAll(r.Body); err == nil {
423-
r.Body.Close()
423+
_ = r.Body.Close()
424424
var msg map[string]interface{}
425425
if err := json.Unmarshal(body, &msg); err == nil {
426426
delete(msg, "sessionId")
@@ -462,7 +462,7 @@ func ping(w http.ResponseWriter, _ *http.Request) {
462462
lrt := lastReloadTime.Format(time.RFC3339)
463463
confLock.RUnlock()
464464
w.Header().Set("Content-Type", "application/json")
465-
json.NewEncoder(w).Encode(struct {
465+
_ = json.NewEncoder(w).Encode(struct {
466466
Uptime string `json:"uptime"`
467467
LastReloadTime string `json:"lastReloadTime"`
468468
NumRequests uint64 `json:"numRequests"`
@@ -479,7 +479,7 @@ func ping(w http.ResponseWriter, _ *http.Request) {
479479

480480
func status(w http.ResponseWriter, _ *http.Request) {
481481
w.Header().Set("Content-Type", "application/json")
482-
json.NewEncoder(w).Encode(
482+
_ = json.NewEncoder(w).Encode(
483483
map[string]interface{}{
484484
"value": map[string]interface{}{
485485
"message": fmt.Sprintf("Ggr %s built at %s", gitRevision, buildStamp),
@@ -500,7 +500,7 @@ func host(w http.ResponseWriter, r *http.Request) {
500500
path := r.URL.Path
501501
if len(path) < tail {
502502
w.WriteHeader(http.StatusBadRequest)
503-
w.Write([]byte("invalid session ID"))
503+
_, _ = w.Write([]byte("invalid session ID"))
504504
return
505505
}
506506
sum := path[head:tail]
@@ -509,12 +509,12 @@ func host(w http.ResponseWriter, r *http.Request) {
509509
confLock.RUnlock()
510510
if !ok {
511511
w.WriteHeader(http.StatusNotFound)
512-
w.Write([]byte("unknown host"))
512+
_, _ = w.Write([]byte("unknown host"))
513513
return
514514
}
515515
log.Printf("[%d] [-] [HOST_INFO_REQUESTED] [%s] [%s] [-] [%s] [%s] [-] [-]\n", id, user, remote, h.Name, sum)
516516
w.Header().Set("Content-Type", "application/json")
517-
json.NewEncoder(w).Encode(Host{Name: h.Name, Port: h.Port, Count: h.Count})
517+
_ = json.NewEncoder(w).Encode(Host{Name: h.Name, Port: h.Port, Count: h.Count})
518518
}
519519

520520
func quotaInfo(w http.ResponseWriter, r *http.Request) {
@@ -539,7 +539,7 @@ func quotaInfo(w http.ResponseWriter, r *http.Request) {
539539
}
540540
}
541541
}
542-
json.NewEncoder(w).Encode(browsers.Browsers.Browsers)
542+
_ = json.NewEncoder(w).Encode(browsers.Browsers.Browsers)
543543
}
544544

545545
func postOnly(handler http.HandlerFunc) http.HandlerFunc {
@@ -726,10 +726,10 @@ func proxyConn(id uint64, wsconn *websocket.Conn, conn net.Conn, err error, sess
726726
wsconn.PayloadType = websocket.BinaryFrame
727727
go func() {
728728
io.Copy(wsconn, conn)
729-
wsconn.Close()
729+
_ = wsconn.Close()
730730
log.Printf("[%d] [-] [WS_SESSION_CLOSED] [-] [-] [-] [%s] [%s] [-] [-]", id, address, sessionID)
731731
}()
732-
io.Copy(conn, wsconn)
732+
_, _ = io.Copy(conn, wsconn)
733733
log.Printf("[%d] [-] [WS_CLIENT_DISCONNECTED] [-] [-] [-] [%s] [%s] [-] [-]", id, address, sessionID)
734734
}
735735

0 commit comments

Comments
 (0)