Skip to content

Commit 1b8bca7

Browse files
committed
Print bandwidth limit information
1 parent 6404e91 commit 1b8bca7

File tree

1 file changed

+14
-25
lines changed

1 file changed

+14
-25
lines changed

cmd/daze/main.go

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"flag"
55
"fmt"
66
"log"
7-
"math"
87
"net"
98
"net/http"
109
"net/http/pprof"
@@ -90,13 +89,14 @@ func main() {
9089
}
9190
log.Println("main: domain server is", *flDnserv)
9291
}
92+
if *flLimits != "" {
93+
log.Println("main: bandwidth is set", *flLimits)
94+
}
9395
switch *flProtoc {
9496
case "ashe":
9597
server := ashe.NewServer(*flListen, *flCipher)
9698
if *flLimits != "" {
97-
n := daze.SizeParser(*flLimits)
98-
doa.Doa(n <= math.MaxInt)
99-
server.Limits = rate.NewLimits(n, time.Second)
99+
server.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
100100
}
101101
defer server.Close()
102102
doa.Nil(server.Run())
@@ -106,27 +106,21 @@ func main() {
106106
server.Masker = *flExtend
107107
}
108108
if *flLimits != "" {
109-
n := daze.SizeParser(*flLimits)
110-
doa.Doa(n <= math.MaxInt)
111-
server.Limits = rate.NewLimits(n, time.Second)
109+
server.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
112110
}
113111
defer server.Close()
114112
doa.Nil(server.Run())
115113
case "czar":
116114
server := czar.NewServer(*flListen, *flCipher)
117115
if *flLimits != "" {
118-
n := daze.SizeParser(*flLimits)
119-
doa.Doa(n <= math.MaxInt)
120-
server.Limits = rate.NewLimits(n, time.Second)
116+
server.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
121117
}
122118
defer server.Close()
123119
doa.Nil(server.Run())
124120
case "dahlia":
125121
server := dahlia.NewServer(*flListen, *flExtend, *flCipher)
126122
if *flLimits != "" {
127-
n := daze.SizeParser(*flLimits)
128-
doa.Doa(n <= math.MaxInt)
129-
server.Limits = rate.NewLimits(n, time.Second)
123+
server.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
130124
}
131125
defer server.Close()
132126
doa.Nil(server.Run())
@@ -167,6 +161,9 @@ func main() {
167161
}
168162
log.Println("main: domain server is", *flDnserv)
169163
}
164+
if *flLimits != "" {
165+
log.Println("main: bandwidth is set", *flLimits)
166+
}
170167
switch *flProtoc {
171168
case "ashe":
172169
client := ashe.NewClient(*flServer, *flCipher)
@@ -176,9 +173,7 @@ func main() {
176173
Cidr: *flCidrls,
177174
}))
178175
if *flLimits != "" {
179-
n := daze.SizeParser(*flLimits)
180-
doa.Doa(n <= math.MaxInt)
181-
locale.Limits = rate.NewLimits(n, time.Second)
176+
locale.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
182177
}
183178
defer locale.Close()
184179
doa.Nil(locale.Run())
@@ -190,9 +185,7 @@ func main() {
190185
Cidr: *flCidrls,
191186
}))
192187
if *flLimits != "" {
193-
n := daze.SizeParser(*flLimits)
194-
doa.Doa(n <= math.MaxInt)
195-
locale.Limits = rate.NewLimits(n, time.Second)
188+
locale.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
196189
}
197190
defer locale.Close()
198191
doa.Nil(locale.Run())
@@ -205,18 +198,14 @@ func main() {
205198
Cidr: *flCidrls,
206199
}))
207200
if *flLimits != "" {
208-
n := daze.SizeParser(*flLimits)
209-
doa.Doa(n <= math.MaxInt)
210-
locale.Limits = rate.NewLimits(n, time.Second)
201+
locale.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
211202
}
212203
defer locale.Close()
213204
doa.Nil(locale.Run())
214205
case "dahlia":
215206
client := dahlia.NewClient(*flListen, *flServer, *flCipher)
216207
if *flLimits != "" {
217-
n := daze.SizeParser(*flLimits)
218-
doa.Doa(n <= math.MaxInt)
219-
client.Limits = rate.NewLimits(n, time.Second)
208+
client.Limits = rate.NewLimits(daze.SizeParser(*flLimits), time.Second)
220209
}
221210
defer client.Close()
222211
doa.Nil(client.Run())

0 commit comments

Comments
 (0)