zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify code, format makefile (#233)

Browse Source
This commit is contained in:
Kevin Wan
2020-11-28 22:27:58 +08:00
committed by GitHub
parent bed494d904
commit e5c560e8ba
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/collection/rollingwindow.go
View File

@@ -76,22 +76,23 @@ func (rw *RollingWindow) updateOffset() {
span := rw.span()
if span > 0 {
offset := rw.offset
// reset expired buckets
start := offset + 1
steps := start + span
offset = (offset + span) % rw.size
var remainder int
if steps > rw.size {
remainder = steps - rw.size
steps = rw.size
}
// reset expired buckets
for i := start; i < steps; i++ {
rw.win.resetBucket(i)
}
for i := 0; i < remainder; i++ {
rw.win.resetBucket(i)
}
rw.offset = offset
rw.offset = (offset + span) % rw.size
rw.lastTime = timex.Now()
}
}

8
tools/goctl/Makefile
View File

@@ -2,13 +2,13 @@ version := $(shell /bin/date "+%Y-%m-%d %H:%M")
build:
go build -ldflags="-s -w" -ldflags="-X 'main.BuildTime=$(version)'" goctl.go
$(if $(shell command -v upx),upx goctl)
$(if $(shell command -v upx), upx goctl)
mac:
GOOS=darwin go build -ldflags="-s -w" -ldflags="-X 'main.BuildTime=$(version)'" -o goctl-darwin goctl.go
$(if $(shell command -v upx),upx goctl-darwin)
$(if $(shell command -v upx), upx goctl-darwin)
win:
GOOS=windows go build -ldflags="-s -w" -ldflags="-X 'main.BuildTime=$(version)'" -o goctl.exe goctl.go
$(if $(shell command -v upx),upx goctl.exe)
$(if $(shell command -v upx), upx goctl.exe)
linux:
GOOS=linux go build -ldflags="-s -w" -ldflags="-X 'main.BuildTime=$(version)'" -o goctl-linux goctl.go
$(if $(shell command -v upx),upx goctl-linux)
$(if $(shell command -v upx), upx goctl-linux)