Move registry package into handler package

The goal is to free up the distribution/registry package to include common
registry types. This moves the webapp definitions out of the way to allow for
this change in the future.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2015-02-10 17:25:40 -08:00
parent 90c2e4b460
commit 0f08b6961a
15 changed files with 21 additions and 18 deletions

View file

@ -14,12 +14,12 @@ import (
_ "github.com/docker/distribution/auth/token"
"github.com/docker/distribution/configuration"
ctxu "github.com/docker/distribution/context"
"github.com/docker/distribution/registry"
"github.com/docker/distribution/registry/handlers"
_ "github.com/docker/distribution/storagedriver/filesystem"
_ "github.com/docker/distribution/storagedriver/inmemory"
_ "github.com/docker/distribution/storagedriver/s3"
"github.com/docker/distribution/version"
"github.com/gorilla/handlers"
gorhandlers "github.com/gorilla/handlers"
"github.com/yvasiyarov/gorelic"
"golang.org/x/net/context"
)
@ -50,9 +50,9 @@ func main() {
ctx = context.WithValue(ctx, "version", version.Version)
ctx = ctxu.WithLogger(ctx, ctxu.GetLogger(ctx, "version"))
app := registry.NewApp(ctx, *config)
app := handlers.NewApp(ctx, *config)
handler := configureReporting(app)
handler = handlers.CombinedLoggingHandler(os.Stdout, handler)
handler = gorhandlers.CombinedLoggingHandler(os.Stdout, handler)
if config.HTTP.Debug.Addr != "" {
go debugServer(config.HTTP.Debug.Addr)
@ -118,7 +118,7 @@ func logLevel(level configuration.Loglevel) log.Level {
return l
}
func configureReporting(app *registry.App) http.Handler {
func configureReporting(app *handlers.App) http.Handler {
var handler http.Handler = app
if app.Config.Reporting.Bugsnag.APIKey != "" {

3
registry/doc.go Normal file
View file

@ -0,0 +1,3 @@
// Package registry is a placeholder package for registry interface
// destinations and utilities.
package registry

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"bytes"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"fmt"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"encoding/json"

View file

@ -1,6 +1,6 @@
// +build go1.4
package registry
package handlers
import (
"net/http"

View file

@ -1,6 +1,6 @@
// +build !go1.4
package registry
package handlers
import (
"encoding/base64"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"fmt"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"encoding/json"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"crypto/hmac"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import "testing"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"encoding/json"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"net/http"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"fmt"

View file

@ -1,4 +1,4 @@
package registry
package handlers
import (
"encoding/json"