From 5ce6bbf07672bf3f3c8d26cd2ce0e3e853a47c44 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 2 Jun 2016 18:09:14 -0700
Subject: directory structure change to work with glide

glide has its own requirements. My previous workaround caused me some
code checkin errors. Need to fix this.
---
 go/util/net_timeout.go | 81 --------------------------------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 go/util/net_timeout.go

(limited to 'go/util/net_timeout.go')

diff --git a/go/util/net_timeout.go b/go/util/net_timeout.go
deleted file mode 100644
index ad8396e18..000000000
--- a/go/util/net_timeout.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package util
-
-import (
-	"net"
-	"time"
-
-	"github.com/chrislusf/seaweedfs/go/stats"
-)
-
-// Listener wraps a net.Listener, and gives a place to store the timeout
-// parameters. On Accept, it will wrap the net.Conn with our own Conn for us.
-type Listener struct {
-	net.Listener
-	ReadTimeout  time.Duration
-	WriteTimeout time.Duration
-}
-
-func (l *Listener) Accept() (net.Conn, error) {
-	c, err := l.Listener.Accept()
-	if err != nil {
-		return nil, err
-	}
-	stats.ConnectionOpen()
-	tc := &Conn{
-		Conn:         c,
-		ReadTimeout:  l.ReadTimeout,
-		WriteTimeout: l.WriteTimeout,
-	}
-	return tc, nil
-}
-
-// Conn wraps a net.Conn, and sets a deadline for every read
-// and write operation.
-type Conn struct {
-	net.Conn
-	ReadTimeout  time.Duration
-	WriteTimeout time.Duration
-}
-
-func (c *Conn) Read(b []byte) (count int, e error) {
-	err := c.Conn.SetReadDeadline(time.Now().Add(c.ReadTimeout))
-	if err != nil {
-		return 0, err
-	}
-	count, e = c.Conn.Read(b)
-	if e == nil {
-		stats.BytesIn(int64(count))
-	}
-	return
-}
-
-func (c *Conn) Write(b []byte) (count int, e error) {
-	err := c.Conn.SetWriteDeadline(time.Now().Add(c.WriteTimeout))
-	if err != nil {
-		return 0, err
-	}
-	count, e = c.Conn.Write(b)
-	if e == nil {
-		stats.BytesOut(int64(count))
-	}
-	return
-}
-
-func (c *Conn) Close() error {
-	stats.ConnectionClose()
-	return c.Conn.Close()
-}
-
-func NewListener(addr string, timeout time.Duration) (net.Listener, error) {
-	l, err := net.Listen("tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	tl := &Listener{
-		Listener:     l,
-		ReadTimeout:  timeout,
-		WriteTimeout: timeout,
-	}
-	return tl, nil
-}
-- 
cgit v1.2.3