修改http client结构

Author: c-wind

http/client/client.go

@@ -11,14 +11,13 @@ import (
 	"github.com/zssky/log"
 )
 
-//Client 对http client简单封装.
-type Client struct {
+type httpClient struct {
 	hc http.Client
 }
 
 //NewClient 创建一个带超时控制的http client.
-func NewClient(timeout time.Duration) Client {
-	return Client{
+func New(timeout time.Duration) httpClient {
+	return httpClient{
 		hc: http.Client{
 			Transport: &http.Transport{
 				Dial: func(netw, addr string) (net.Conn, error) {
@@ -39,7 +38,7 @@ func NewClient(timeout time.Duration) Client {
 	}
 }
 
-func (c Client) do(method, url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
+func (c httpClient) do(method, url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
 	var req *http.Request
 	var err error
 
@@ -72,22 +71,18 @@ func (c Client) do(method, url string, headers map[string]string, body *bytes.Bu
 	return data, resp.StatusCode, nil
 }
 
-//Get get 请求...
-func (c Client) Get(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
+func (c httpClient) Get(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
 	return c.do("GET", url, headers, body)
 }
 
-//POST post 请求.
-func (c Client) POST(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
+func (c httpClient) POST(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
 	return c.do("POST", url, headers, body)
 }
 
-//PUT put 请求.
-func (c Client) PUT(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
+func (c httpClient) PUT(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
 	return c.do("PUT", url, headers, body)
 }
 
-//DELETE delete 请求.
-func (c Client) DELETE(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
+func (c httpClient) DELETE(url string, headers map[string]string, body *bytes.Buffer) ([]byte, int, error) {
 	return c.do("DELETE", url, headers, body)
 }

http/server/handler.go

@@ -10,6 +10,7 @@ import (
 	"sync"
 
 	"github.com/google/btree"
+	"github.com/juju/errors"
 	"github.com/zssky/log"
 )
 
@@ -24,9 +25,10 @@ type iface struct {
 }
 
 type httpServer struct {
-	path   map[string]iface
-	prefix *btree.BTree
-	filter Filter
+	path     map[string]iface
+	prefix   *btree.BTree
+	filter   Filter
+	listener net.Listener
 	sync.RWMutex
 }
 
@@ -84,14 +86,14 @@ func AddInterface(obj interface{}, path string, isPrefix bool) error {
 	rv := reflect.ValueOf(obj)
 	for i := 0; i < rv.NumMethod(); i++ {
 		method := rt.Method(i).Name
-		log.Debugf("rt:%v, %d, method:%v", rt, i, method)
+		//log.Debugf("rt:%v, %d, method:%v", rt, i, method)
 		switch method {
 		case POST.String():
 		case GET.String():
 		case PUT.String():
 		case DELETE.String():
 		default:
-			log.Debugf("ignore method:%v path:%v", method, path)
+			log.Warnf("ignore %v %v %v", method, path, rt)
 			continue
 		}
 
@@ -106,7 +108,7 @@ func AddInterface(obj interface{}, path string, isPrefix bool) error {
 				panic(fmt.Sprintf("exist url:%v %v", method, path))
 			}
 			server.prefix.ReplaceOrInsert(&ifc)
-			log.Debugf("add prefix:%v", path)
+			log.Infof("add prefix %v %v %v", method, path, rt)
 			continue
 		}
 
@@ -116,6 +118,7 @@ func AddInterface(obj interface{}, path string, isPrefix bool) error {
 		}
 
 		server.path[ifc.path] = ifc
+		log.Infof("add path %v %v %v", method, path, rt)
 	}
 
 	return nil
@@ -187,6 +190,23 @@ func defaultFilter(_ http.ResponseWriter, r *http.Request) *http.Request {
 }
 
 //Start 启动httpServer.
-func Start(l net.Listener) error {
-	return http.Serve(l, server)
+func Start(addr string) error {
+	ln, err := net.Listen("tcp", addr)
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	server.Lock()
+	server.listener = ln
+	server.Unlock()
+
+	return http.Serve(ln, server)
+}
+
+//Stop 停止httpServer监听, 进行中的任务并不会因此而停止.
+func Stop() error {
+	server.Lock()
+	defer server.Unlock()
+
+	return server.listener.Close()
 }

main.go

@@ -3,9 +3,10 @@ package main
 import (
 	"flag"
 	"fmt"
-	"net"
 	"net/http"
+	"time"
 
+	"github.com/dearcode/crab/http/client"
 	"github.com/dearcode/crab/http/server"
 	_ "github.com/dearcode/crab/server"
 )
@@ -19,17 +20,29 @@ func (i *index) GET(w http.ResponseWriter, req *http.Request) {
 	w.Write([]byte(fmt.Sprintf("client:%v addr:%p", i.r.RemoteAddr, i)))
 }
 
-func main() {
-	addr := flag.String("h", ":9000", "api listen address")
-	flag.Parse()
-
-	ln, err := net.Listen("tcp", *addr)
+func testHTTPClient() {
+	url := "http://127.0.0.1:9000/index"
+	buf, _, err := client.New(time.Second).Get(url, nil, nil)
 	if err != nil {
 		panic(err.Error())
 	}
+	fmt.Printf("response:%s\n", buf)
+}
+
+func main() {
+	addr := flag.String("h", ":9000", "api listen address")
+	flag.Parse()
 
 	server.AddInterface(&index{}, "/index", false)
-	if err = server.Start(ln); err != nil {
+
+	go func() {
+		for i := 0; i < 5; i++ {
+			time.Sleep(time.Second)
+			testHTTPClient()
+		}
+	}()
+
+	if err := server.Start(*addr); err != nil {
 		panic(err.Error())
 	}
 }