Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"encoding/json"
"errors"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/pool/metrics"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion handlers/apiProxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"net/url"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/pool"
)

Expand Down
2 changes: 1 addition & 1 deletion handlers/createSession.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"github.com/qa-dev/jsonwire-grid/pool"
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
Expand Down
2 changes: 1 addition & 1 deletion handlers/registerNode.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"strconv"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"github.com/qa-dev/jsonwire-grid/pool"
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
Expand Down
2 changes: 1 addition & 1 deletion handlers/useSession.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"regexp"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/pool"
)

Expand Down
2 changes: 1 addition & 1 deletion logger/logger.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package logger

import (
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"

"fmt"
"github.com/qa-dev/jsonwire-grid/config"
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/config"
"github.com/qa-dev/jsonwire-grid/handlers"
"github.com/qa-dev/jsonwire-grid/logger"
Expand Down
2 changes: 1 addition & 1 deletion middleware/statsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

"fmt"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"gopkg.in/alexcesaro/statsd.v2"
"regexp"
)
Expand Down
2 changes: 1 addition & 1 deletion middleware/wrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package middleware
import (
"net/http"
"runtime/debug"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)

type Wrap struct {
Expand Down
2 changes: 1 addition & 1 deletion middleware/wrap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package middleware

import (
"testing"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"net/http"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pool/metrics/metrics.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package metrics

import (
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/pool"
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
"gopkg.in/alexcesaro/statsd.v2"
Expand Down
2 changes: 1 addition & 1 deletion pool/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"errors"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
)

Expand Down
2 changes: 1 addition & 1 deletion pool/strategy/kubernetes/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)

type StrategyFactory struct {
Expand Down
2 changes: 1 addition & 1 deletion pool/strategy/kubernetes/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package kubernetes

import (
"errors"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"k8s.io/client-go/kubernetes"
apiV1 "k8s.io/client-go/pkg/api/v1"
Expand Down
8 changes: 4 additions & 4 deletions pool/strategy/persistent/strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package persistent

import (
"errors"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"github.com/qa-dev/jsonwire-grid/pool"
"github.com/qa-dev/jsonwire-grid/pool/capabilities"
Expand Down Expand Up @@ -45,10 +45,10 @@ func (s *Strategy) Reserve(desiredCaps capabilities.Capabilities) (pool.Node, er
client := s.clientFactory.Create(node.Address)
message, err := client.Health()
if err != nil {
log.Infof("Remove unavailable node [%s], %s", node, err)
log.Infof("Remove unavailable node [%s], %s", &node, err)
err = s.storage.Remove(node)
if err != nil {
log.Errorf("Remove unavailable node [%s], %s", node, err)
log.Errorf("Remove unavailable node [%s], %s", &node, err)
}
continue
}
Expand All @@ -62,7 +62,7 @@ func (s *Strategy) Reserve(desiredCaps capabilities.Capabilities) (pool.Node, er
//todo: посылать в мониторинг событие, если вернулся не 0
_, err = seleniumNode.removeAllSessions()
if err != nil {
log.Warningf("remove all existing sessions from node [%v], [%v]", node, err)
log.Warningf("remove all existing sessions from node [%s], [%v]", &node, err)
continue
}

Expand Down
2 changes: 1 addition & 1 deletion proxy/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io/ioutil"
"net/http"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"

"errors"
"github.com/qa-dev/jsonwire-grid/jsonwire"
Expand Down
2 changes: 1 addition & 1 deletion storage/mysql/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package mysql

import (
"errors"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
_ "github.com/go-sql-driver/mysql"
"github.com/jmoiron/sqlx"
"github.com/qa-dev/jsonwire-grid/config"
Expand Down
2 changes: 1 addition & 1 deletion testing/webdriver-mock-creator/webdriver-mock-creator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"os/exec"
"os/signal"
Expand Down
2 changes: 1 addition & 1 deletion testing/webdriver-node-mock/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"github.com/satori/go.uuid"
"math/rand"
Expand Down
2 changes: 1 addition & 1 deletion testing/webdriver-node-mock/webdriver-node-mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"flag"
"fmt"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/qa-dev/jsonwire-grid/jsonwire"
"io/ioutil"
"math/rand"
Expand Down
2 changes: 1 addition & 1 deletion utils/metrics/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
"gopkg.in/alexcesaro/statsd.v2"
)

Expand Down
10 changes: 0 additions & 10 deletions vendor/github.com/Sirupsen/logrus/terminal_appengine.go

This file was deleted.

10 changes: 0 additions & 10 deletions vendor/github.com/Sirupsen/logrus/terminal_bsd.go

This file was deleted.

14 changes: 0 additions & 14 deletions vendor/github.com/Sirupsen/logrus/terminal_linux.go

This file was deleted.

28 changes: 0 additions & 28 deletions vendor/github.com/Sirupsen/logrus/terminal_notwindows.go

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/Sirupsen/logrus/terminal_solaris.go

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/Sirupsen/logrus/terminal_windows.go

This file was deleted.

Loading