[ARVADOS] updated: 1.3.0-165-g443a0b963
Git user
git at public.curoverse.com
Fri Jan 11 10:18:45 EST 2019
Summary of changes:
lib/cloud/azure.go | 27 +++++++++++-----------
lib/cloud/interfaces.go | 11 +++++----
lib/controller/federation_test.go | 2 +-
lib/controller/server_test.go | 2 +-
lib/dispatchcloud/container/queue.go | 2 +-
lib/dispatchcloud/dispatcher.go | 4 ++--
lib/dispatchcloud/dispatcher_test.go | 2 +-
lib/dispatchcloud/driver.go | 5 ++--
lib/dispatchcloud/scheduler/run_queue.go | 2 +-
lib/dispatchcloud/scheduler/run_queue_test.go | 2 +-
lib/dispatchcloud/scheduler/scheduler.go | 2 +-
lib/dispatchcloud/scheduler/sync.go | 2 +-
lib/dispatchcloud/test/stub_driver.go | 2 +-
lib/dispatchcloud/worker/pool.go | 2 +-
lib/dispatchcloud/worker/pool_test.go | 2 +-
lib/dispatchcloud/worker/worker.go | 2 +-
lib/service/cmd.go | 2 +-
sdk/go/ctxlog/log.go | 2 +-
sdk/go/dispatch/dispatch.go | 2 +-
sdk/go/httpserver/logger.go | 2 +-
sdk/go/httpserver/logger_test.go | 2 +-
sdk/go/httpserver/metrics.go | 2 +-
.../crunch-dispatch-local/crunch-dispatch-local.go | 2 +-
.../crunch-dispatch-local_test.go | 2 +-
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 2 +-
.../crunch-dispatch-slurm_test.go | 2 +-
services/crunch-dispatch-slurm/squeue_test.go | 2 +-
services/health/main.go | 2 +-
services/keep-balance/balance.go | 2 +-
services/keep-balance/balance_run_test.go | 2 +-
services/keep-balance/integration_test.go | 2 +-
services/keep-balance/main.go | 2 +-
services/keep-balance/server.go | 2 +-
services/keep-web/handler.go | 2 +-
services/keep-web/main.go | 2 +-
services/keepproxy/keepproxy.go | 2 +-
services/keepstore/config.go | 2 +-
services/keepstore/config_test.go | 2 +-
services/ws/router.go | 2 +-
services/ws/session_v0.go | 2 +-
vendor/vendor.json | 12 +++++-----
41 files changed, 67 insertions(+), 64 deletions(-)
via 443a0b96316ed46600dc5035193adae6ac4d1f74 (commit)
from 855a0afbc604487ddaedaed0cc1a4ad6da34b602 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 443a0b96316ed46600dc5035193adae6ac4d1f74
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Fri Jan 11 10:08:37 2019 -0500
14324: Use logrus in Azure driver. Fix Sirupsen->sirupsen in imports
"It's in the past been possible to import Logrus as both upper- and
lower-case. Due to the Go package environment, this caused issues in
the community and we needed a standard. Some environments experienced
problems with the upper-case variant, so the lower-case was
decided. Everything using logrus will need to use the lower-case:
github.com/sirupsen/logrus. Any package that isn't, should be
changed."
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/lib/cloud/azure.go b/lib/cloud/azure.go
index d9f1158fc..d94285d6a 100644
--- a/lib/cloud/azure.go
+++ b/lib/cloud/azure.go
@@ -8,7 +8,6 @@ import (
"context"
"encoding/base64"
"fmt"
- "log"
"net/http"
"regexp"
"strconv"
@@ -27,6 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/jmcvetta/randutil"
"github.com/mitchellh/mapstructure"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)
@@ -200,14 +200,15 @@ type AzureInstanceSet struct {
stopWg sync.WaitGroup
deleteNIC chan string
deleteBlob chan storage.Blob
+ logger logrus.FieldLogger
}
-func NewAzureInstanceSet(config map[string]interface{}, dispatcherID InstanceSetID) (prv InstanceSet, err error) {
+func NewAzureInstanceSet(config map[string]interface{}, dispatcherID InstanceSetID, logger logrus.FieldLogger) (prv InstanceSet, err error) {
azcfg := AzureInstanceSetConfig{}
if err = mapstructure.Decode(config, &azcfg); err != nil {
return nil, err
}
- ap := AzureInstanceSet{}
+ ap := AzureInstanceSet{logger: logger}
err = ap.setup(azcfg, string(dispatcherID))
if err != nil {
return nil, err
@@ -273,9 +274,9 @@ func (az *AzureInstanceSet) setup(azcfg AzureInstanceSetConfig, dispatcherID str
}
_, delerr := az.netClient.Delete(context.Background(), az.azconfig.ResourceGroup, nicname)
if delerr != nil {
- log.Printf("Error deleting %v: %v", nicname, delerr)
+ az.logger.WithError(delerr).Warnf("Error deleting %v", nicname)
} else {
- log.Printf("Deleted %v", nicname)
+ az.logger.Printf("Deleted NIC %v", nicname)
}
}
}()
@@ -287,9 +288,9 @@ func (az *AzureInstanceSet) setup(azcfg AzureInstanceSetConfig, dispatcherID str
}
err := blob.Delete(nil)
if err != nil {
- log.Printf("error deleting %v: %v", blob.Name, err)
+ az.logger.WithError(err).Warnf("Error deleting %v", blob.Name)
} else {
- log.Printf("Deleted blob %v", blob.Name)
+ az.logger.Printf("Deleted blob %v", blob.Name)
}
}
}()
@@ -475,7 +476,7 @@ func (az *AzureInstanceSet) ManageNics() (map[string]network.Interface, error) {
timestamp := time.Now()
for ; result.NotDone(); err = result.Next() {
if err != nil {
- log.Printf("Error listing nics: %v", err)
+ az.logger.WithError(err).Warnf("Error listing nics")
return interfaces, nil
}
if strings.HasPrefix(*result.Value().Name, az.namePrefix) {
@@ -486,7 +487,7 @@ func (az *AzureInstanceSet) ManageNics() (map[string]network.Interface, error) {
created_at, err := time.Parse(time.RFC3339Nano, *result.Value().Tags["created-at"])
if err == nil {
if timestamp.Sub(created_at).Seconds() > az.azconfig.DeleteDanglingResourcesAfter {
- log.Printf("Will delete %v because it is older than %v s", *result.Value().Name, az.azconfig.DeleteDanglingResourcesAfter)
+ az.logger.Printf("Will delete %v because it is older than %v s", *result.Value().Name, az.azconfig.DeleteDanglingResourcesAfter)
az.deleteNIC <- *result.Value().Name
}
}
@@ -508,14 +509,14 @@ func (az *AzureInstanceSet) ManageBlobs() {
result, err := az.storageAcctClient.ListKeys(az.ctx, az.azconfig.ResourceGroup, az.azconfig.StorageAccount)
if err != nil {
- log.Printf("Couldn't get account keys %v", err)
+ az.logger.WithError(err).Warn("Couldn't get account keys")
return
}
key1 := *(*result.Keys)[0].Value
client, err := storage.NewBasicClientOnSovereignCloud(az.azconfig.StorageAccount, key1, az.azureEnv)
if err != nil {
- log.Printf("Couldn't make client %v", err)
+ az.logger.WithError(err).Warn("Couldn't make client")
return
}
@@ -528,7 +529,7 @@ func (az *AzureInstanceSet) ManageBlobs() {
for {
response, err := blobcont.ListBlobs(page)
if err != nil {
- log.Printf("Error listing blobs %v", err)
+ az.logger.WithError(err).Warn("Error listing blobs")
return
}
for _, b := range response.Blobs {
@@ -538,7 +539,7 @@ func (az *AzureInstanceSet) ManageBlobs() {
b.Properties.LeaseStatus == "unlocked" &&
age.Seconds() > az.azconfig.DeleteDanglingResourcesAfter {
- log.Printf("Blob %v is unlocked and not modified for %v seconds, will delete", b.Name, age.Seconds())
+ az.logger.Printf("Blob %v is unlocked and not modified for %v seconds, will delete", b.Name, age.Seconds())
az.deleteBlob <- b
}
}
diff --git a/lib/cloud/interfaces.go b/lib/cloud/interfaces.go
index e3a072582..969a4bc2d 100644
--- a/lib/cloud/interfaces.go
+++ b/lib/cloud/interfaces.go
@@ -9,6 +9,7 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)
@@ -163,17 +164,17 @@ type InstanceSet interface {
//
// var _ = registerCloudDriver("example", &exampleDriver{})
type Driver interface {
- InstanceSet(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)
+ InstanceSet(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)
}
// DriverFunc makes a Driver using the provided function as its
// InstanceSet method. This is similar to http.HandlerFunc.
-func DriverFunc(fn func(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)) Driver {
+func DriverFunc(fn func(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)) Driver {
return driverFunc(fn)
}
-type driverFunc func(config map[string]interface{}, id InstanceSetID) (InstanceSet, error)
+type driverFunc func(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error)
-func (df driverFunc) InstanceSet(config map[string]interface{}, id InstanceSetID) (InstanceSet, error) {
- return df(config, id)
+func (df driverFunc) InstanceSet(config map[string]interface{}, id InstanceSetID, logger logrus.FieldLogger) (InstanceSet, error) {
+ return df(config, id, logger)
}
diff --git a/lib/controller/federation_test.go b/lib/controller/federation_test.go
index db39029be..c935e20be 100644
--- a/lib/controller/federation_test.go
+++ b/lib/controller/federation_test.go
@@ -21,7 +21,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/lib/controller/server_test.go b/lib/controller/server_test.go
index 7742cf4ea..95f17e79e 100644
--- a/lib/controller/server_test.go
+++ b/lib/controller/server_test.go
@@ -12,7 +12,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go
index 432f4d488..965407e51 100644
--- a/lib/dispatchcloud/container/queue.go
+++ b/lib/dispatchcloud/container/queue.go
@@ -10,8 +10,8 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
+ "github.com/sirupsen/logrus"
)
type typeChooser func(*arvados.Container) (arvados.InstanceType, error)
diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index 81ad0ed3f..2415094ac 100644
--- a/lib/dispatchcloud/dispatcher.go
+++ b/lib/dispatchcloud/dispatcher.go
@@ -21,9 +21,9 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/auth"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
- "github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)
@@ -121,7 +121,7 @@ func (disp *dispatcher) initialize() {
disp.sshKey = key
}
- instanceSet, err := newInstanceSet(disp.Cluster, disp.InstanceSetID)
+ instanceSet, err := newInstanceSet(disp.Cluster, disp.InstanceSetID, disp.logger)
if err != nil {
disp.logger.Fatalf("error initializing driver: %s", err)
}
diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 33823a828..1f9457743 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -16,7 +16,7 @@ import (
"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
check "gopkg.in/check.v1"
)
diff --git a/lib/dispatchcloud/driver.go b/lib/dispatchcloud/driver.go
index 97c1bc773..a6e62e05b 100644
--- a/lib/dispatchcloud/driver.go
+++ b/lib/dispatchcloud/driver.go
@@ -9,16 +9,17 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "github.com/sirupsen/logrus"
)
var drivers = map[string]cloud.Driver{
"azure": cloud.DriverFunc(cloud.NewAzureInstanceSet),
}
-func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID) (cloud.InstanceSet, error) {
+func newInstanceSet(cluster *arvados.Cluster, setID cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) {
driver, ok := drivers[cluster.CloudVMs.Driver]
if !ok {
return nil, fmt.Errorf("unsupported cloud driver %q", cluster.CloudVMs.Driver)
}
- return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID)
+ return driver.InstanceSet(cluster.CloudVMs.DriverParameters, setID, logger)
}
diff --git a/lib/dispatchcloud/scheduler/run_queue.go b/lib/dispatchcloud/scheduler/run_queue.go
index ece8e3d98..8e74caef0 100644
--- a/lib/dispatchcloud/scheduler/run_queue.go
+++ b/lib/dispatchcloud/scheduler/run_queue.go
@@ -10,7 +10,7 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/lib/dispatchcloud/container"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
func (sch *Scheduler) runQueue() {
diff --git a/lib/dispatchcloud/scheduler/run_queue_test.go b/lib/dispatchcloud/scheduler/run_queue_test.go
index be13e1c34..8945f88a1 100644
--- a/lib/dispatchcloud/scheduler/run_queue_test.go
+++ b/lib/dispatchcloud/scheduler/run_queue_test.go
@@ -11,7 +11,7 @@ import (
"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
"git.curoverse.com/arvados.git/lib/dispatchcloud/worker"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/lib/dispatchcloud/scheduler/scheduler.go b/lib/dispatchcloud/scheduler/scheduler.go
index 3971a5319..83fc08a9f 100644
--- a/lib/dispatchcloud/scheduler/scheduler.go
+++ b/lib/dispatchcloud/scheduler/scheduler.go
@@ -10,7 +10,7 @@ import (
"sync"
"time"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
// A Scheduler maps queued containers onto unallocated workers in
diff --git a/lib/dispatchcloud/scheduler/sync.go b/lib/dispatchcloud/scheduler/sync.go
index 4c55b3c0d..47c754e24 100644
--- a/lib/dispatchcloud/scheduler/sync.go
+++ b/lib/dispatchcloud/scheduler/sync.go
@@ -10,7 +10,7 @@ import (
"git.curoverse.com/arvados.git/lib/dispatchcloud/container"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
// sync resolves discrepancies between the queue and the pool:
diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index 8bdfaa947..3c23457c9 100644
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -17,8 +17,8 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
"github.com/mitchellh/mapstructure"
+ "github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)
diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index ff5f762c1..fc3301d86 100644
--- a/lib/dispatchcloud/worker/pool.go
+++ b/lib/dispatchcloud/worker/pool.go
@@ -13,8 +13,8 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
"github.com/prometheus/client_golang/prometheus"
+ "github.com/sirupsen/logrus"
)
const (
diff --git a/lib/dispatchcloud/worker/pool_test.go b/lib/dispatchcloud/worker/pool_test.go
index 3867e2c63..7551caff9 100644
--- a/lib/dispatchcloud/worker/pool_test.go
+++ b/lib/dispatchcloud/worker/pool_test.go
@@ -11,7 +11,7 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/lib/dispatchcloud/test"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/lib/dispatchcloud/worker/worker.go b/lib/dispatchcloud/worker/worker.go
index c26186309..db6bc185b 100644
--- a/lib/dispatchcloud/worker/worker.go
+++ b/lib/dispatchcloud/worker/worker.go
@@ -12,7 +12,7 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
// State indicates whether a worker is available to do work, and (if
diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 4584939f7..7f6b0236c 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -15,8 +15,8 @@ import (
"git.curoverse.com/arvados.git/lib/cmd"
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
- "github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
+ "github.com/sirupsen/logrus"
)
type Handler interface {
diff --git a/sdk/go/ctxlog/log.go b/sdk/go/ctxlog/log.go
index fa76a4f96..45e4efdbe 100644
--- a/sdk/go/ctxlog/log.go
+++ b/sdk/go/ctxlog/log.go
@@ -7,7 +7,7 @@ package ctxlog
import (
"context"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
var (
diff --git a/sdk/go/dispatch/dispatch.go b/sdk/go/dispatch/dispatch.go
index c8fb5aeb3..fdb52e510 100644
--- a/sdk/go/dispatch/dispatch.go
+++ b/sdk/go/dispatch/dispatch.go
@@ -14,7 +14,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
const (
diff --git a/sdk/go/httpserver/logger.go b/sdk/go/httpserver/logger.go
index 9577718c7..357daee26 100644
--- a/sdk/go/httpserver/logger.go
+++ b/sdk/go/httpserver/logger.go
@@ -10,7 +10,7 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/stats"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
type contextKey struct {
diff --git a/sdk/go/httpserver/logger_test.go b/sdk/go/httpserver/logger_test.go
index bdde3303e..8386db927 100644
--- a/sdk/go/httpserver/logger_test.go
+++ b/sdk/go/httpserver/logger_test.go
@@ -12,7 +12,7 @@ import (
"testing"
"time"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/sdk/go/httpserver/metrics.go b/sdk/go/httpserver/metrics.go
index a0455f11b..032093f8d 100644
--- a/sdk/go/httpserver/metrics.go
+++ b/sdk/go/httpserver/metrics.go
@@ -12,10 +12,10 @@ import (
"git.curoverse.com/arvados.git/sdk/go/auth"
"git.curoverse.com/arvados.git/sdk/go/stats"
- "github.com/Sirupsen/logrus"
"github.com/gogo/protobuf/jsonpb"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
+ "github.com/sirupsen/logrus"
)
type Handler interface {
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index fc1039362..dcd54e896 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -20,7 +20,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/dispatch"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
var version = "dev"
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index 6da17ea86..6bae1f409 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -20,7 +20,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/dispatch"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
. "gopkg.in/check.v1"
)
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 092524d80..31329c123 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -23,7 +23,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/config"
"git.curoverse.com/arvados.git/sdk/go/dispatch"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 10fdb0712..eea102012 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -24,7 +24,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/dispatch"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
. "gopkg.in/check.v1"
)
diff --git a/services/crunch-dispatch-slurm/squeue_test.go b/services/crunch-dispatch-slurm/squeue_test.go
index de674a139..ce74fe61c 100644
--- a/services/crunch-dispatch-slurm/squeue_test.go
+++ b/services/crunch-dispatch-slurm/squeue_test.go
@@ -7,7 +7,7 @@ package main
import (
"time"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
. "gopkg.in/check.v1"
)
diff --git a/services/health/main.go b/services/health/main.go
index 1d2ec47a6..21fcf4d67 100644
--- a/services/health/main.go
+++ b/services/health/main.go
@@ -12,7 +12,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
- log "github.com/Sirupsen/logrus"
+ log "github.com/sirupsen/logrus"
)
var version = "dev"
diff --git a/services/keep-balance/balance.go b/services/keep-balance/balance.go
index e1b207805..836be2e60 100644
--- a/services/keep-balance/balance.go
+++ b/services/keep-balance/balance.go
@@ -18,7 +18,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
// Balancer compares the contents of keepstore servers with the
diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index f7cb7f92b..7e2adcfed 100644
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -16,7 +16,7 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index ceffb9cc1..8f5d08a19 100644
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -15,7 +15,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
check "gopkg.in/check.v1"
)
diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index e3e90d358..3316a1724 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -15,7 +15,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
var debugf = func(string, ...interface{}) {}
diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index ad13be751..613a2f7d3 100644
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -15,7 +15,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/auth"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
var version = "dev"
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 6a7dc5dba..b5c11e553 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -25,7 +25,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- log "github.com/Sirupsen/logrus"
+ log "github.com/sirupsen/logrus"
"golang.org/x/net/webdav"
)
diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index d09fce706..fd6353569 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -12,7 +12,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/config"
- log "github.com/Sirupsen/logrus"
+ log "github.com/sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index b6c8bd66a..def97e6e0 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -26,7 +26,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/health"
"git.curoverse.com/arvados.git/sdk/go/httpserver"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- log "github.com/Sirupsen/logrus"
+ log "github.com/sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
"github.com/ghodss/yaml"
"github.com/gorilla/mux"
diff --git a/services/keepstore/config.go b/services/keepstore/config.go
index 2e3fe0a5b..2bd989de3 100644
--- a/services/keepstore/config.go
+++ b/services/keepstore/config.go
@@ -13,7 +13,7 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
type Config struct {
diff --git a/services/keepstore/config_test.go b/services/keepstore/config_test.go
index d6471e3d4..e3b0ffc22 100644
--- a/services/keepstore/config_test.go
+++ b/services/keepstore/config_test.go
@@ -5,7 +5,7 @@
package main
import (
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
func init() {
diff --git a/services/ws/router.go b/services/ws/router.go
index 987c225ea..a408b58bd 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -15,7 +15,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/ctxlog"
"git.curoverse.com/arvados.git/sdk/go/health"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
"golang.org/x/net/websocket"
)
diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index b57abb5ca..7bd149815 100644
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -14,7 +14,7 @@ import (
"time"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/Sirupsen/logrus"
+ "github.com/sirupsen/logrus"
)
var (
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 6bf8c016d..ec5fa21e2 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -114,12 +114,6 @@
"revisionTime": "2017-08-04T20:09:54Z"
},
{
- "checksumSHA1": "CWLxwFSj7MNed2MzAOSm0Cg9p+o=",
- "path": "github.com/Sirupsen/logrus",
- "revision": "d682213848ed68c0a260ca37d6dd5ace8423f5ba",
- "revisionTime": "2017-12-05T20:32:29Z"
- },
- {
"checksumSHA1": "spyv5/YFBjYyZLZa1U2LBfDR8PM=",
"path": "github.com/beorn7/perks/quantile",
"revision": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9",
@@ -499,6 +493,12 @@
"revisionTime": "2017-11-10T11:01:46Z"
},
{
+ "checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=",
+ "path": "github.com/sirupsen/logrus",
+ "revision": "d682213848ed68c0a260ca37d6dd5ace8423f5ba",
+ "revisionTime": "2017-12-05T20:32:29Z"
+ },
+ {
"checksumSHA1": "8QeSG127zQqbA+YfkO1WkKx/iUI=",
"path": "github.com/src-d/gcfg",
"revision": "f187355171c936ac84a82793659ebb4936bc1c23",
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list