Browse Source

fix: bench dir ci error and enable ci lint check

pull/170/head
liulei 4 years ago
parent
commit
ce76ded47d
  1. 5
      .github/workflows/tests.yml
  2. 6
      .golangci.yml
  3. 2
      bench/main.go
  4. 19
      bench/svr/http.go

5
.github/workflows/tests.yml

@ -41,5 +41,8 @@ jobs:
run: | run: |
go mod download go mod download
- name: Run ci lint
run: make lint
- name: Run test cover - name: Run test cover
run: sh helper/test-cover.sh run: sh helper/test-cover.sh

6
.golangci.yml

@ -1,8 +1,8 @@
run: run:
deadline: 5m deadline: 5m
# skip-dirs: skip-dirs:
# - test - test
# - examples # - bench
linter-settings: linter-settings:
goconst: goconst:

2
bench/main.go

@ -21,7 +21,7 @@ usage:
` `
func hintAndExit() { func hintAndExit() {
fmt.Printf(usage) fmt.Print(usage)
os.Exit(0) os.Exit(0)
} }

19
bench/svr/http.go

@ -65,10 +65,11 @@ func reloadData() {
logger.Debugf("%d users inserted. used: %dms", total, time.Since(began).Milliseconds()) logger.Debugf("%d users inserted. used: %dms", total, time.Since(began).Milliseconds())
} }
var uidCounter int32 = 0 var uidCounter int32
var mode string = "" var mode string
var sqls int = 1 var sqls = 1
// PrepareBenchDB prepares db data for bench
func PrepareBenchDB() { func PrepareBenchDB() {
db := pdbGet() db := pdbGet()
_, err := dtmimp.DBExec(db, "drop table if exists dtm_busi.user_account_log") _, err := dtmimp.DBExec(db, "drop table if exists dtm_busi.user_account_log")
@ -95,7 +96,9 @@ func StartSvr() {
app := dtmutil.GetGinApp() app := dtmutil.GetGinApp()
benchAddRoute(app) benchAddRoute(app)
logger.Debugf("bench listening at %d", benchPort) logger.Debugf("bench listening at %d", benchPort)
go app.Run(fmt.Sprintf(":%s", benchPort)) go func() {
_ = app.Run(fmt.Sprintf(":%s", benchPort))
}()
} }
func qsAdjustBalance(uid int, amount int, c *gin.Context) (interface{}, error) { func qsAdjustBalance(uid int, amount int, c *gin.Context) (interface{}, error) {
@ -116,11 +119,13 @@ func qsAdjustBalance(uid int, amount int, c *gin.Context) (interface{}, error) {
if strings.Contains(mode, "barrier") { if strings.Contains(mode, "barrier") {
barrier, err := dtmcli.BarrierFromQuery(c.Request.URL.Query()) barrier, err := dtmcli.BarrierFromQuery(c.Request.URL.Query())
logger.FatalIfError(err) logger.FatalIfError(err)
barrier.Call(txGet(), f) err = barrier.Call(txGet(), f)
logger.FatalIfError(err)
} else { } else {
tx := txGet() tx := txGet()
f(tx) err := f(tx)
err := tx.Commit() logger.FatalIfError(err)
err = tx.Commit()
logger.FatalIfError(err) logger.FatalIfError(err)
} }

Loading…
Cancel
Save