From e53bf5defa617c4a694ec9361590db167ce7ede5 Mon Sep 17 00:00:00 2001
From: Bartek Plotka <bwplotka@gmail.com>
Date: Tue, 3 Oct 2017 20:41:36 +0100
Subject: [PATCH] Fixed wrong import.

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
---
 CHANGELOG.md        | 1 +
 Dockerfile_loadtest | 2 +-
 server/main.go      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60fb981..ab3de3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
diff --git a/Dockerfile_loadtest b/Dockerfile_loadtest
index 512ded8..32136ad 100644
--- a/Dockerfile_loadtest
+++ b/Dockerfile_loadtest
@@ -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 \
diff --git a/server/main.go b/server/main.go
index ce00701..a2ac9e7 100644
--- a/server/main.go
+++ b/server/main.go
@@ -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"
@@ -42,6 +41,7 @@ import (
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"github.com/Sirupsen/logrus"
 )
 
 var (
@@ -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()