From d82cf7dd487730c5d5ff88c49a36c580ede31458 Mon Sep 17 00:00:00 2001 From: Jessica Forrester Date: Tue, 9 Sep 2014 17:16:07 -0400 Subject: [PATCH] Rebased and fixed test cases --- pkg/apiserver/apiserver.go | 1 - pkg/apiserver/proxy.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 2593688efbf..34845c2abc1 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -24,7 +24,6 @@ import ( "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/httplog" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" "github.com/GoogleCloudPlatform/kubernetes/pkg/version" "github.com/golang/glog" diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go index 98330530ec1..caeeb0eaec5 100644 --- a/pkg/apiserver/proxy.go +++ b/pkg/apiserver/proxy.go @@ -89,14 +89,14 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { } storage, ok := r.storage[resourceName] if !ok { - httplog.LogOf(w).Addf("'%v' has no storage object", resourceName) + httplog.LogOf(req, w).Addf("'%v' has no storage object", resourceName) notFound(w, req) return } redirector, ok := storage.(Redirector) if !ok { - httplog.LogOf(w).Addf("'%v' is not a redirector", resourceName) + httplog.LogOf(req, w).Addf("'%v' is not a redirector", resourceName) notFound(w, req) return }