Skip to content
This repository has been archived by the owner on Sep 15, 2022. It is now read-only.

Commit

Permalink
Fixed wrong import.
Browse files Browse the repository at this point in the history
Signed-off-by: Bartek Plotka <[email protected]>
  • Loading branch information
bwplotka committed Oct 4, 2017
1 parent f85dbfd commit e53bf5d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Kedge service:
* [x] added stripping out proxy auth header after using it.
* [x] fixed error handling causing in particular cases.
* [x] added graceful shutdown

Winch (kedge client):
* [x] better error handling (adding response headers to indicate what error happen)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_loadtest
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENV GOBIN=/go/bin

RUN mkdir /etc/corp-auth

RUN apt-get update && apt-get install -qq -y --no-install-recommends git wget curl ca-certificates openssh-client
RUN apt-get update && apt-get install -qq -y --no-install-recommends git vim wget curl ca-certificates openssh-client

RUN curl -fsSL "${GOLANG_DOWNLOAD_URL}" -o golang.tar.gz \
&& tar -C /usr/local -xzf golang.tar.gz \
Expand Down
4 changes: 2 additions & 2 deletions server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"syscall"
"time"

"github.com/Sirupsen/logrus"
"github.com/grpc-ecosystem/go-grpc-middleware"
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
"github.com/grpc-ecosystem/go-grpc-middleware/tags"
Expand Down Expand Up @@ -42,6 +41,7 @@ import (
"golang.org/x/net/trace"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"github.com/Sirupsen/logrus"
)

var (
Expand Down Expand Up @@ -256,7 +256,7 @@ func main() {
}

func shutdown(ctx context.Context, bouncer *http.Server, grpcDirector *grpc.Server, debugServer *http.Server) {
logrus.Info("Shutting down servers gracefully.")
log.Info("Shutting down servers gracefully.")

innerCtx, cancel := context.WithTimeout(ctx, 20*time.Second)
defer cancel()
Expand Down

0 comments on commit e53bf5d

Please sign in to comment.