move apigateway into apiserver (#1948)

pkg/server/filter/logging.go

@@ -1,61 +0,0 @@
-/*
-
- Copyright 2019 The KubeSphere Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-package filter
-
-import (
-	"k8s.io/klog"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/emicklei/go-restful"
-)
-
-func Logging(req *restful.Request, resp *restful.Response, chain *restful.FilterChain) {
-	start := time.Now()
-	chain.ProcessFilter(req, resp)
-	klog.V(4).Infof("%s - \"%s %s %s\" %d %d %dms",
-		getRequestIP(req),
-		req.Request.Method,
-		req.Request.RequestURI,
-		req.Request.Proto,
-		resp.StatusCode(),
-		resp.ContentLength(),
-		time.Since(start)/time.Millisecond,
-	)
-}
-
-func getRequestIP(req *restful.Request) string {
-	address := strings.Trim(req.Request.Header.Get("X-Real-Ip"), " ")
-	if address != "" {
-		return address
-	}
-
-	address = strings.Trim(req.Request.Header.Get("X-Forwarded-For"), " ")
-	if address != "" {
-		return address
-	}
-
-	address, _, err := net.SplitHostPort(req.Request.RemoteAddr)
-	if err != nil {
-		return req.Request.RemoteAddr
-	}
-
-	return address
-}

pkg/server/server.go

@@ -1,24 +0,0 @@
-package server
-
-import (
-	"bytes"
-	"fmt"
-	"k8s.io/klog"
-	"net/http"
-	"runtime"
-)
-
-func LogStackOnRecover(panicReason interface{}, httpWriter http.ResponseWriter) {
-	var buffer bytes.Buffer
-	buffer.WriteString(fmt.Sprintf("recover from panic situation: - %v\r\n", panicReason))
-	for i := 2; ; i += 1 {
-		_, file, line, ok := runtime.Caller(i)
-		if !ok {
-			break
-		}
-		buffer.WriteString(fmt.Sprintf("    %s:%d\r\n", file, line))
-	}
-	klog.Error(buffer.String())
-	httpWriter.WriteHeader(http.StatusInternalServerError)
-	httpWriter.Write([]byte("recover from panic situation"))
-}