From 3bd116f27c57953fac1317094e6f0e0fc5639425 Mon Sep 17 00:00:00 2001 From: xvf Date: Thu, 17 Jan 2019 18:59:04 -0500 Subject: [PATCH 1/5] Moving to latest UUID lib --- grpc/interceptor/logger.go | 2 +- vendor/vendor.json | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/grpc/interceptor/logger.go b/grpc/interceptor/logger.go index 97acc12..98f3a48 100644 --- a/grpc/interceptor/logger.go +++ b/grpc/interceptor/logger.go @@ -5,8 +5,8 @@ import ( "golang.org/x/net/context" + uuid "github.com/gofrs/uuid" "github.com/namely/mjolnir/logger" - uuid "github.com/satori/go.uuid" "github.com/sirupsen/logrus" "google.golang.org/grpc" ) diff --git a/vendor/vendor.json b/vendor/vendor.json index bea2244..15510aa 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -15,6 +15,12 @@ "revision": "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f", "revisionTime": "2017-08-14T20:04:35Z" }, + { + "checksumSHA1": "+QA+yCapL80NO5GzibuyicX6g0E=", + "path": "github.com/gofrs/uuid", + "revision": "6b08a5c5172ba18946672b49749cde22873dd7c2", + "revisionTime": "2019-01-11T07:18:23Z" + }, { "checksumSHA1": "yqF125xVSkmfLpIVGrLlfE05IUk=", "path": "github.com/golang/protobuf/proto", @@ -57,6 +63,18 @@ "revision": "0a025b7e63adc15a622f29b0b2c4c3848243bbf6", "revisionTime": "2016-08-13T22:13:03Z" }, + { + "path": "github.com/namely/mjolnir/grpc/interceptor", + "revision": "" + }, + { + "path": "github.com/namely/mjolnir/health", + "revision": "" + }, + { + "path": "github.com/namely/mjolnir/logger", + "revision": "" + }, { "checksumSHA1": "zKKp5SZ3d3ycKe4EKMNT0BqAWBw=", "origin": "github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib", @@ -64,12 +82,6 @@ "revision": "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f", "revisionTime": "2017-08-14T20:04:35Z" }, - { - "checksumSHA1": "HU1Eoct2jP2YjhvfJGkogXfYFfI=", - "path": "github.com/satori/go.uuid", - "revision": "0ef6afb2f6cdd6cdaeee3885a95099c63f18fc8c", - "revisionTime": "2018-01-03T16:02:28Z" - }, { "checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=", "path": "github.com/sirupsen/logrus", @@ -137,7 +149,7 @@ "revisionTime": "2017-12-11T20:45:21Z" }, { - "checksumSHA1": "LGrodHuObKohCrLBDzLKIpEZsPs=", + "checksumSHA1": "ZwEZK9AUUeSqDnWUO4fDc9rwTIA=", "path": "golang.org/x/sys/unix", "revision": "83801418e1b59fb1880e363299581ee543af32ca", "revisionTime": "2017-12-22T10:59:23Z" @@ -161,13 +173,13 @@ "revisionTime": "2017-12-13T18:21:11Z" }, { - "checksumSHA1": "1oQpUH9BjCWlqFPDahRH+UMlYy4=", + "checksumSHA1": "w8kDfZ1Ug+qAcVU0v8obbu3aDOY=", "path": "golang.org/x/text/unicode/bidi", "revision": "eb22672bea55af56d225d4e35405f4d2e9f062a0", "revisionTime": "2017-12-13T18:21:11Z" }, { - "checksumSHA1": "lN2xlA6Utu7tXy2iUoMF2+y9EUE=", + "checksumSHA1": "BCNYmf4Ek93G4lk5x3ucNi/lTwA=", "path": "golang.org/x/text/unicode/norm", "revision": "eb22672bea55af56d225d4e35405f4d2e9f062a0", "revisionTime": "2017-12-13T18:21:11Z" From 4d6117ff977f5e835a407d9cf8cc558dd7b16e26 Mon Sep 17 00:00:00 2001 From: xvf Date: Thu, 17 Jan 2019 19:12:39 -0500 Subject: [PATCH 2/5] Fixing imports --- grpc/interceptor/logger.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/grpc/interceptor/logger.go b/grpc/interceptor/logger.go index 98f3a48..cd2d326 100644 --- a/grpc/interceptor/logger.go +++ b/grpc/interceptor/logger.go @@ -3,11 +3,10 @@ package interceptor import ( "time" - "golang.org/x/net/context" - uuid "github.com/gofrs/uuid" "github.com/namely/mjolnir/logger" "github.com/sirupsen/logrus" + "golang.org/x/net/context" "google.golang.org/grpc" ) From d74cf5a6dc3ea4bad32fa5b20bffe818c7fbf51f Mon Sep 17 00:00:00 2001 From: xvf Date: Thu, 17 Jan 2019 19:12:56 -0500 Subject: [PATCH 3/5] fixing travis to remove go get --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ddff88b..a728ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ go: - 1.8.x before_install: - go get -u github.com/kardianos/govendor -- go get ./... - govendor sync script: - go test -v ./... From f48c051f32913e82fd55832787f9c74319dc54dd Mon Sep 17 00:00:00 2001 From: xvf Date: Thu, 17 Jan 2019 22:38:47 -0500 Subject: [PATCH 4/5] updating test command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a728ace..cd34e2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: - go get -u github.com/kardianos/govendor - govendor sync script: -- go test -v ./... +- govendor test +local notifications: slack: secure: NMyvwkeUxKJiJoTE2SDt/AIrPSrdsCkrn1jX7qdblJNELk4SZ03VFQ6Psq/F7E6Mch9xjjVBA3J4wB1nT2tFAspa12/J5Knafp4KWvbWv/JoiWNQ2Yte6ehhc/02n3IIgp3wUwXXY8a/TN2e9tBgIMGaLKpXjgO8SCPsyP8DOSQt8IiK7mBqHA9o5S0RgiWRuvTcZKHRcARcJIoL1KS8dGiHrhKGh4knfHX3RS4eHWPt1r0yEwQqmzesRzWRecOGX+lzMH2erSPppjThH5qFmY9cY8Jf2VNB5Nj68V4TfYyvEyngvi5Xp4mxH5TXX75gOYPMfQj1c0j5XsL1ionMuAo9w2usU7sY3bLG/6FHom486iAu3P+vcCSrq6xsialJKxOvG7aL6hMPEjcr5gcQNW8NsNwxPpOCLUNBpGDDOlKvHiEvO+lgMfzpqJo2e5P1T/hVD9kOqriul1fpNWqSsEm1POCQJ8v7k8tS8G02+YYfk68IthNMok7zvVa8nNefXQevYXPqNUNwSaCxyFIa6Yh8pksX5ES+1ywVqtYu2um7J40vwp+ZBbQVQRU05W3wG4/Phb99l3i6kGI6ygQAtGeK2e40plvVdMYZj2Tu8cGHfG0cQjTJ2u9otwJU+TeAnf3J8TCwEGmjxcnnCHbHgoV3BbnNuj/CIsrPxerB4KQ= From 58415fbdd894e2ccfcaeb02ab832ede44a794a5e Mon Sep 17 00:00:00 2001 From: Jaemin Sung Date: Thu, 7 Feb 2019 10:20:40 -0500 Subject: [PATCH 5/5] add time.Sleep in health_test.go --- health/health_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/health/health_test.go b/health/health_test.go index 689821b..b8b79bf 100644 --- a/health/health_test.go +++ b/health/health_test.go @@ -16,6 +16,9 @@ func TestTCPListener(t *testing.T) { t.Logf("Hello world") }() + // wait 100 ms to wait for TCP listener to get ready + time.Sleep(100 * time.Millisecond) + conn, err := net.DialTimeout("tcp", host, 100*time.Millisecond) if err != nil { t.Errorf("could not dial connection: %v", err)