Merge pull request #2136 from bradrydzewski/master [ci skip]

remove broken plugins pending redesign [ci skip]
harness · Jul 24, 2017 · a5a339a · a5a339a
2 parents 6930274 + 07c82aa
commit a5a339a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 109 deletions.
diff --git a/cmd/drone-server/server.go b/cmd/drone-server/server.go
@@ -18,8 +18,6 @@ import (
 	"github.com/cncd/logging"
 	"github.com/cncd/pipeline/pipeline/rpc/proto"
 	"github.com/cncd/pubsub"
-	"github.com/drone/drone/plugins/registry"
-	"github.com/drone/drone/plugins/secrets"
 	"github.com/drone/drone/plugins/sender"
 	"github.com/drone/drone/remote"
 	"github.com/drone/drone/router"
@@ -555,12 +553,6 @@ func setupEvilGlobals(c *cli.Context, v store.Store, r remote.Remote) {
 	droneserver.Config.Services.Senders = sender.New(v, v)
 	droneserver.Config.Services.Environ = setupEnvironService(c, v)
 
-	if endpoint := c.String("registry-service"); endpoint != "" {
-		droneserver.Config.Services.Registries = registry.NewRemote(endpoint)
-	}
-	if endpoint := c.String("secret-service"); endpoint != "" {
-		droneserver.Config.Services.Secrets = secrets.NewRemote(endpoint)
-	}
 	if endpoint := c.String("gating-service"); endpoint != "" {
 		droneserver.Config.Services.Senders = sender.NewRemote(endpoint)
 	}

diff --git a/plugins/registry/plugin.go b/plugins/registry/plugin.go
diff --git a/plugins/registry/plugin_test.go b/plugins/registry/plugin_test.go
diff --git a/plugins/secrets/plugin.go b/plugins/secrets/plugin.go
diff --git a/plugins/secrets/plugin_test.go b/plugins/secrets/plugin_test.go
diff --git a/server/stream.go b/server/stream.go
@@ -210,6 +210,7 @@ func EventStreamSSE(c *gin.Context) {
 	c.Header("Content-Type", "text/event-stream")
 	c.Header("Cache-Control", "no-cache")
 	c.Header("Connection", "keep-alive")
+	c.Header("X-Accel-Buffering", "no")
 
 	rw := c.Writer