vendor: add package io

fatedier · May 8, 2018 · 1dd7317 · 1dd7317
1 parent dd8f788
commit 1dd7317
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 155 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -35,7 +35,7 @@
 
 [[constraint]]
   name = "github.com/fatedier/golib"
-  revision = "c4d2b1c9ff1798d2d9adfd1d03179579ee054c09"
+  branch = "master"
 
 [[constraint]]
   branch = "frp"

diff --git a/client/proxy.go b/client/proxy.go
@@ -27,11 +27,11 @@ import (
 	"github.com/fatedier/frp/models/msg"
 	"github.com/fatedier/frp/models/plugin"
 	"github.com/fatedier/frp/models/proto/udp"
-	frpIo "github.com/fatedier/frp/utils/io"
 	"github.com/fatedier/frp/utils/log"
 	frpNet "github.com/fatedier/frp/utils/net"
 
 	"github.com/fatedier/golib/errors"
+	frpIo "github.com/fatedier/golib/io"
 	"github.com/fatedier/golib/pool"
 )
 

diff --git a/client/visitor.go b/client/visitor.go
@@ -29,11 +29,11 @@ import (
 	"github.com/fatedier/frp/g"
 	"github.com/fatedier/frp/models/config"
 	"github.com/fatedier/frp/models/msg"
-	frpIo "github.com/fatedier/frp/utils/io"
 	"github.com/fatedier/frp/utils/log"
 	frpNet "github.com/fatedier/frp/utils/net"
 	"github.com/fatedier/frp/utils/util"
 
+	frpIo "github.com/fatedier/golib/io"
 	"github.com/fatedier/golib/pool"
 )
 

diff --git a/models/plugin/http_proxy.go b/models/plugin/http_proxy.go
@@ -22,8 +22,9 @@ import (
 	"net/http"
 	"strings"
 
-	frpIo "github.com/fatedier/frp/utils/io"
 	frpNet "github.com/fatedier/frp/utils/net"
+
+	frpIo "github.com/fatedier/golib/io"
 )
 
 const PluginHttpProxy = "http_proxy"

diff --git a/models/plugin/unix_domain_socket.go b/models/plugin/unix_domain_socket.go
@@ -19,8 +19,9 @@ import (
 	"io"
 	"net"
 
-	frpIo "github.com/fatedier/frp/utils/io"
 	frpNet "github.com/fatedier/frp/utils/net"
+
+	frpIo "github.com/fatedier/golib/io"
 )
 
 const PluginUnixDomainSocket = "unix_domain_socket"

diff --git a/server/manager.go b/server/manager.go
@@ -19,9 +19,10 @@ import (
 	"io"
 	"sync"
 
-	frpIo "github.com/fatedier/frp/utils/io"
 	frpNet "github.com/fatedier/frp/utils/net"
 	"github.com/fatedier/frp/utils/util"
+
+	frpIo "github.com/fatedier/golib/io"
 )
 
 type ControlManager struct {

diff --git a/server/proxy.go b/server/proxy.go
@@ -27,13 +27,13 @@ import (
 	"github.com/fatedier/frp/models/config"
 	"github.com/fatedier/frp/models/msg"
 	"github.com/fatedier/frp/models/proto/udp"
-	frpIo "github.com/fatedier/frp/utils/io"
 	"github.com/fatedier/frp/utils/log"
 	frpNet "github.com/fatedier/frp/utils/net"
 	"github.com/fatedier/frp/utils/util"
 	"github.com/fatedier/frp/utils/vhost"
 
 	"github.com/fatedier/golib/errors"
+	frpIo "github.com/fatedier/golib/io"
 )
 
 type Proxy interface {

diff --git a/utils/io/io_test.go b/utils/io/io_test.go
diff --git a/utils/vhost/reverseproxy.go b/utils/vhost/reverseproxy.go
@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	frpIo "github.com/fatedier/frp/utils/io"
+	frpIo "github.com/fatedier/golib/io"
 )
 
 // onExitFlushLoop is a callback set by tests to detect the state of the

diff --git a/utils/io/io.go → vendor/github.com/fatedier/golib/io/io.go b/utils/io/io.go → vendor/github.com/fatedier/golib/io/io.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ import ( @@
     	"sync"
     	"time"
-    	frpIo "github.com/fatedier/frp/utils/io"
+    	frpIo "github.com/fatedier/golib/io"
     )
     // onExitFlushLoop is a callback set by tests to detect the state of the
@@ Expand Down @@