fix

Author: Mikhail Podtserkovskiy

.travis.yml

@@ -3,13 +3,9 @@ language: go
 go:
   - 1.8.x
 
-
-before_install:
-  - mysql -e 'CREATE DATABASE grid;'
 install: make get-deps prepare
 script:
   - make test
-  - make concurrency-test
 services:
   - mysql
 

Dockerfile

@@ -7,6 +7,6 @@ ENV CONFIG_PATH ./config.json
 
 RUN make
 
-CMD ["service-entrypoint"]
+CMD ["jsonwire-grid"]
 
 EXPOSE 4444

Makefile

@@ -1,5 +1,4 @@
 export CONFIG_PATH=./config.json
-
 TEST_CONFIG_PATH=./config-test.json
 all: get-deps build
 
@@ -13,7 +12,8 @@ help:
 	@echo "run      - start application"
 
 build: prepare
-	go build -o ${GOPATH}/bin/service-entrypoint
+	@echo "Install jsonwire-grid"
+	go install github.com/qa-dev/jsonwire-grid
 
 fmt:
 	go fmt
@@ -27,18 +27,27 @@ get-deps:
 prepare: fmt gen
 
 run: build
-	${GOPATH}/bin/service-entrypoint
+	@echo "Start jsonwire-grid"
+	jsonwire-grid
 
 test:
 	go test ./...
 
 concurrency-test-prepare: build
+	@echo "Install jsonwire-grid"
 	go install github.com/qa-dev/jsonwire-grid/testing/webdriver-node-mock
+	@echo "Install webdriver-node-mock"
 	go install github.com/qa-dev/jsonwire-grid/testing/webdriver-mock-creator
+	@echo "Install webdriver-mock-creator"
 	go install github.com/qa-dev/jsonwire-grid/testing/webdriver-concurrency-test
-	nohupkillall -9 service-entrypoint >/dev/null 2>&1 &
-	CONFIG_PATH=$(TEST_CONFIG_PATH) ${GOPATH}/bin/service-entrypoint &
+	@echo "Kill all running jsonwire-grid"
+	killall -9 jsonwire-grid &
+	@echo "Wait 1s"
+	sleep 1
+	@echo "Start jsonwire-grid"
+	CONFIG_PATH=$(TEST_CONFIG_PATH) jsonwire-grid &
 
 concurrency-test: concurrency-test-prepare
+	@echo "Start webdriver-concurrency-test"
 	webdriver-concurrency-test
 

config-sample.json

@@ -4,7 +4,7 @@
   },
   "db": {
       "implementation": "mysql",
-      "connection": "root:@(localhost:3306)/grid?tx_isolation=SERIALIZABLE&parseTime=true"
+      "connection": "root:@(localhost:3306)/grid?tx_isolation=SERIALIZABLE&parseTime=true&interpolateParams=true"
   },
   "grid": {
     "port": 4444,

config-test.json

@@ -4,7 +4,7 @@
   },
   "db": {
       "implementation": "mysql",
-      "connection": "root:@(127.0.0.1:3306)/grid?tx_isolation=SERIALIZABLE&parseTime=true"
+      "connection": "root:@(127.0.0.1:3306)/grid?tx_isolation=SERIALIZABLE&parseTime=true&interpolateParams=true"
   },
   "grid": {
     "port": 4444,

main.go

@@ -79,15 +79,20 @@ func main() {
 	http.Handle("/", m.Log(&handlers.UseSession{Pool: poolInstance}))
 
 	server := &http.Server{Addr: fmt.Sprintf(":%v", cfg.Grid.Port)}
+	serverError := make(chan error)
 	go func() {
 		err = server.ListenAndServe()
 		if err != nil {
-			// todo: норма ли что при закрытии всегда возвращается еррор???
-			log.Errorf("Listen serve error, %s", err)
+			// todo: норма ли что при вызове server.Shutdown всегда возвращается еррор???
+			serverError <- err
 		}
 	}()
 
-	<-stop
+	select {
+	case err = <-serverError:
+		log.Fatalf("Server error, %s", err)
+	case <-stop:
+	}
 
 	log.Info("Shutting down the server...")
 

storage/mysql/factory.go

@@ -21,7 +21,7 @@ func (f *Factory) Create(config config.Config) (pool.StorageInterface, error) {
 		return nil, err
 	}
 
-	db.SetMaxIdleConns(0) // this is the root problem! set it to 0 to remove all idle connections
+	db.SetMaxIdleConns(0)  // this is the root problem! set it to 0 to remove all idle connections
 	db.SetMaxOpenConns(50) // or whatever is appropriate for your setup.
 
 	storage := NewMysqlStorage(db)

storage/mysql/storage.go

@@ -2,13 +2,13 @@ package mysql
 
 import (
 	"errors"
+	"fmt"
 	"github.com/jmoiron/sqlx"
 	"github.com/qa-dev/jsonwire-grid/pool"
 	"sort"
 	"strconv"
-	"time"
-	"fmt"
 	"strings"
+	"time"
 )
 
 type MysqlNodeModel struct {

testing/webdriver-concurrency-test/webdriver-concurrency-test.go

@@ -25,11 +25,12 @@ var (
 	durationStr *string
 )
 
+// todo: prototype
 func main() {
 	hubUrl = flag.String("hub", "http://127.0.0.1:4444", "address of hub, default http://127.0.0.1:4444")
-	level = flag.Int("level", 100, "count parallell conections")
+	level = flag.Int("level", 50, "count parallell conections")
 	durationStr = flag.String("duration", "30s", "duration of test, string format ex. 12m, see time.ParseDuration()")
-	mockMaxDuration := flag.Int("mockMaxDuration", 100, "request duration [0 <=duration], default 0")
+	mockMaxDuration := flag.Int("mockMaxDuration", 500, "request duration [0 <=duration], default 0")
 	mockStartPort := flag.Int("mockStartPort", 5000, "mockStartPort")
 	flag.Parse()
 
@@ -62,7 +63,7 @@ func main() {
 
 	go func() {
 		for i := 1; i <= *level && isAlive; i++ {
-			time.Sleep(time.Millisecond * 50)
+			time.Sleep(time.Millisecond * 100)
 			go func() {
 				wg.Add(1)
 				defer wg.Done()

testing/webdriver-mock-creator/webdriver-mock-creator.go

@@ -33,7 +33,7 @@ func main() {
 	}()
 
 	for port := *startPort; port < *startPort+*countNodes && isAlive; port++ {
-		time.Sleep(time.Millisecond)
+		time.Sleep(time.Millisecond * 5)
 		cmd := exec.Command(
 			"webdriver-node-mock",
 			fmt.Sprintf("-hub=%v", *hubUrl),