Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: mv etcdhttp into api pkg

Browse Source
This commit is contained in:
Xiang Li 2016-04-04 16:31:35 -07:00
parent 19136afc2b
commit 2c50eb240e
20 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdmain/etcd.go
View File

@ -34,7 +34,7 @@ import (
"github.com/coreos/etcd/discovery" "github.com/coreos/etcd/discovery"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp" "github.com/coreos/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/pkg/cors" "github.com/coreos/etcd/pkg/cors"
"github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/fileutil"
pkgioutil "github.com/coreos/etcd/pkg/ioutil" pkgioutil "github.com/coreos/etcd/pkg/ioutil"
@ -363,10 +363,10 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
plog.Infof("cors = %s", cfg.corsInfo) plog.Infof("cors = %s", cfg.corsInfo)
} }
ch := http.Handler(&cors.CORSHandler{ ch := http.Handler(&cors.CORSHandler{
Handler: etcdhttp.NewClientHandler(s, srvcfg.ReqTimeout()), Handler: v2http.NewClientHandler(s, srvcfg.ReqTimeout()),
Info: cfg.corsInfo, Info: cfg.corsInfo,
}) })
ph := etcdhttp.NewPeerHandler(s) ph := v2http.NewPeerHandler(s)
// Start the peer server in a goroutine // Start the peer server in a goroutine
for _, l := range plns { for _, l := range plns {

4
etcdserver/etcdhttp/capability.go → etcdserver/api/v2http/capability.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"fmt" "fmt"
@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
) )

4
etcdserver/etcdhttp/client.go → etcdserver/api/v2http/client.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"encoding/json" "encoding/json"
@ -30,8 +30,8 @@ import (
etcdErr "github.com/coreos/etcd/error" etcdErr "github.com/coreos/etcd/error"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/auth" "github.com/coreos/etcd/etcdserver/auth"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
"github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/stats" "github.com/coreos/etcd/etcdserver/stats"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"

4
etcdserver/etcdhttp/client_auth.go → etcdserver/api/v2http/client_auth.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"encoding/json" "encoding/json"
@ -21,8 +21,8 @@ import (
"strings" "strings"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/auth" "github.com/coreos/etcd/etcdserver/auth"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
) )
type authHandler struct { type authHandler struct {

2
etcdserver/etcdhttp/client_auth_test.go → etcdserver/api/v2http/client_auth_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"errors" "errors"

4
etcdserver/etcdhttp/client_test.go → etcdserver/api/v2http/client_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"bytes" "bytes"
@ -30,7 +30,7 @@ import (
etcdErr "github.com/coreos/etcd/error" etcdErr "github.com/coreos/etcd/error"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"

4
etcdserver/etcdhttp/doc.go → etcdserver/api/v2http/doc.go
View File

@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// Package etcdhttp provides etcd client and server implementations. // Package v2http provides etcd client and server implementations.
package etcdhttp package v2http

8
etcdserver/etcdhttp/http.go → etcdserver/api/v2http/http.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"errors" "errors"
@ -23,8 +23,8 @@ import (
etcdErr "github.com/coreos/etcd/error" etcdErr "github.com/coreos/etcd/error"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/auth" "github.com/coreos/etcd/etcdserver/auth"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
"github.com/coreos/etcd/pkg/logutil" "github.com/coreos/etcd/pkg/logutil"
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
) )
@ -35,9 +35,9 @@ const (
) )
var ( var (
plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdhttp") plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api", "v2http")
mlog = logutil.NewMergeLogger(plog) mlog = logutil.NewMergeLogger(plog)
errClosed = errors.New("etcdhttp: client closed connection") errClosed = errors.New("v2http: client closed connection")
) )
// writeError logs and writes the given Error to the ResponseWriter // writeError logs and writes the given Error to the ResponseWriter

2
etcdserver/etcdhttp/http_test.go → etcdserver/api/v2http/http_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"errors" "errors"

2
etcdserver/etcdhttp/httptypes/errors.go → etcdserver/api/v2http/httptypes/errors.go
View File

@ -22,7 +22,7 @@ import (
) )
var ( var (
plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/etcdhttp", "httptypes") plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver/api/v2http", "httptypes")
) )
type HTTPError struct { type HTTPError struct {

0
etcdserver/etcdhttp/httptypes/errors_test.go → etcdserver/api/v2http/httptypes/errors_test.go
View File

0
etcdserver/etcdhttp/httptypes/member.go → etcdserver/api/v2http/httptypes/member.go
View File

0
etcdserver/etcdhttp/httptypes/member_test.go → etcdserver/api/v2http/httptypes/member_test.go
View File

4
etcdserver/etcdhttp/metrics.go → etcdserver/api/v2http/metrics.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"strconv" "strconv"
@ -22,7 +22,7 @@ import (
etcdErr "github.com/coreos/etcd/error" etcdErr "github.com/coreos/etcd/error"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )

2
etcdserver/etcdhttp/peer.go → etcdserver/api/v2http/peer.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"encoding/json" "encoding/json"

2
etcdserver/etcdhttp/peer_test.go → etcdserver/api/v2http/peer_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package etcdhttp package v2http
import ( import (
"encoding/json" "encoding/json"

2
etcdserver/server.go
View File

@ -31,7 +31,7 @@ import (
"github.com/coreos/etcd/auth" "github.com/coreos/etcd/auth"
"github.com/coreos/etcd/compactor" "github.com/coreos/etcd/compactor"
"github.com/coreos/etcd/discovery" "github.com/coreos/etcd/discovery"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/stats" "github.com/coreos/etcd/etcdserver/stats"
"github.com/coreos/etcd/lease" "github.com/coreos/etcd/lease"

6
integration/cluster.go
View File

@ -37,8 +37,8 @@ import (
"github.com/coreos/etcd/client" "github.com/coreos/etcd/client"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/etcdserver/api/v3rpc" "github.com/coreos/etcd/etcdserver/api/v3rpc"
"github.com/coreos/etcd/etcdserver/etcdhttp"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
@ -546,7 +546,7 @@ func (m *member) Launch() error {
m.s.SyncTicker = time.Tick(500 * time.Millisecond) m.s.SyncTicker = time.Tick(500 * time.Millisecond)
m.s.Start() m.s.Start()
m.raftHandler = &testutil.PauseableHandler{Next: etcdhttp.NewPeerHandler(m.s)} m.raftHandler = &testutil.PauseableHandler{Next: v2http.NewPeerHandler(m.s)}
for _, ln := range m.PeerListeners { for _, ln := range m.PeerListeners {
hs := &httptest.Server{ hs := &httptest.Server{
@ -567,7 +567,7 @@ func (m *member) Launch() error {
for _, ln := range m.ClientListeners { for _, ln := range m.ClientListeners {
hs := &httptest.Server{ hs := &httptest.Server{
Listener: ln, Listener: ln,
Config: &http.Server{Handler: etcdhttp.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())}, Config: &http.Server{Handler: v2http.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())},
} }
if m.ClientTLSInfo == nil { if m.ClientTLSInfo == nil {
hs.Start() hs.Start()

2
proxy/reverse.go
View File

@ -28,7 +28,7 @@ import (
"time" "time"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/pkg/httputil" "github.com/coreos/etcd/pkg/httputil"
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
) )

2
test
View File

@ -18,7 +18,7 @@ source ./build
# Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt. # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
PKGS=`ls pkg/*/*go | cut -f1,2 -d/ | sort | uniq` PKGS=`ls pkg/*/*go | cut -f1,2 -d/ | sort | uniq`
TESTABLE_AND_FORMATTABLE="client clientv3 discovery error etcdctl/ctlv2 etcdctl/ctlv3 etcdmain etcdserver etcdserver/auth etcdserver/etcdhttp etcdserver/etcdhttp/httptypes $PKGS proxy raft snap storage storage/backend store version wal" TESTABLE_AND_FORMATTABLE="client clientv3 discovery error etcdctl/ctlv2 etcdctl/ctlv3 etcdmain etcdserver etcdserver/auth etcdserver/api/v2http etcdserver/api/v2http/httptypes $PKGS proxy raft snap storage storage/backend store version wal"
# TODO: add it to race testing when the issue is resolved # TODO: add it to race testing when the issue is resolved
# https://github.com/golang/go/issues/9946 # https://github.com/golang/go/issues/9946
NO_RACE_TESTABLE="rafthttp" NO_RACE_TESTABLE="rafthttp"