Merge pull request #47 from vulcand/maxim/develop

A set of cosmetic changes

.travis.yml

@@ -0,0 +1,9 @@
+language: go
+go:
+  - 1.5.4
+
+script:
+ - go get -t ./...
+ - go test ./...
+ - go vet ./...
+ - go fmt ./...

README.md

@@ -1,4 +1,4 @@
-Oxy
+Oxy [![Build Status](https://travis-ci.org/vulcand/oxy.svg?branch=master)](https://travis-ci.org/vulcand/oxy)
 =====
 
 Oxy is a Go library with HTTP handlers that enhance HTTP standard library:

cbreaker/cbreaker.go

@@ -31,9 +31,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/mailgun/timetools"
 	"github.com/vulcand/oxy/memmetrics"
 	"github.com/vulcand/oxy/utils"
-	"github.com/mailgun/timetools"
 )
 
 // CircuitBreaker is http.Handler that implements circuit breaker pattern

cbreaker/cbreaker_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/mailgun/timetools"
 	"github.com/vulcand/oxy/memmetrics"
 	"github.com/vulcand/oxy/testutils"
-	"github.com/mailgun/timetools"
 
 	. "gopkg.in/check.v1"
 )

cbreaker/effect.go

@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/mailgun/log"
+	log "github.com/Sirupsen/logrus"
 	"github.com/vulcand/oxy/utils"
 )
 

cbreaker/ratio.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/mailgun/log"
+	log "github.com/Sirupsen/logrus"
 	"github.com/mailgun/timetools"
 )
 

ratelimit/tokenlimiter_test.go

@@ -7,9 +7,9 @@ import (
 	"net/http/httptest"
 	"time"
 
+	"github.com/mailgun/timetools"
 	"github.com/vulcand/oxy/testutils"
 	"github.com/vulcand/oxy/utils"
-	"github.com/mailgun/timetools"
 
 	. "gopkg.in/check.v1"
 )

roundrobin/rebalancer.go

@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/mailgun/timetools"
 	"github.com/vulcand/oxy/memmetrics"
 	"github.com/vulcand/oxy/utils"
-	"github.com/mailgun/timetools"
 )
 
 // RebalancerOption - functional option setter for rebalancer

roundrobin/rebalancer_test.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"time"
 
+	"github.com/mailgun/timetools"
 	"github.com/vulcand/oxy/forward"
 	"github.com/vulcand/oxy/testutils"
 	"github.com/vulcand/oxy/utils"
-	"github.com/mailgun/timetools"
 
 	. "gopkg.in/check.v1"
 )

roundrobin/rr.go

@@ -114,8 +114,6 @@ func (r *RoundRobin) nextServer() (*server, error) {
 			return srv, nil
 		}
 	}
-	// We did full circle and found no available servers
-	return nil, fmt.Errorf("no available servers")
 }
 
 func (r *RoundRobin) RemoveServer(u *url.URL) error {