letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run both AMQP and gRPC publisher servers if configured (#1862) 

Updates #1856.

* Run both AMQP and gRPC publisher servers
* Actually run both the servers
* remove debug stuff from test files
This commit is contained in:
Roland Bracewell Shoemaker 2016-06-02 12:46:19 -07:00
parent ba47c61dd6
commit b9f2fa6790
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/boulder-publisher/main.go
View File

@ -52,9 +52,12 @@ func main() {
cmd.FailOnError(err, "Failed to setup gRPC server") cmd.FailOnError(err, "Failed to setup gRPC server")
gw := bgrpc.NewPublisherServerWrapper(pubi) gw := bgrpc.NewPublisherServerWrapper(pubi)
pubPB.RegisterPublisherServer(s, gw) pubPB.RegisterPublisherServer(s, gw)
go func() {
err = s.Serve(l) err = s.Serve(l)
cmd.FailOnError(err, "gRPC service failed") cmd.FailOnError(err, "gRPC service failed")
} else { }()
}
pubs, err := rpc.NewAmqpRPCServer(amqpConf, c.Publisher.MaxConcurrentRPCServerRequests, stats) pubs, err := rpc.NewAmqpRPCServer(amqpConf, c.Publisher.MaxConcurrentRPCServerRequests, stats)
cmd.FailOnError(err, "Unable to create Publisher RPC server") cmd.FailOnError(err, "Unable to create Publisher RPC server")
err = rpc.NewPublisherServer(pubs, pubi) err = rpc.NewPublisherServer(pubs, pubi)
@ -63,7 +66,6 @@ func main() {
err = pubs.Start(amqpConf) err = pubs.Start(amqpConf)
cmd.FailOnError(err, "Unable to run Publisher RPC server") cmd.FailOnError(err, "Unable to run Publisher RPC server")
} }
}
app.Run() app.Run()
} }

1
test/boulder-config-next.json
View File

@ -353,6 +353,7 @@
"amqp": { "amqp": {
"serverURLFile": "test/secrets/amqp_url", "serverURLFile": "test/secrets/amqp_url",
"insecure": true, "insecure": true,
"serviceQueue": "Publisher.server",
"SA": { "SA": {
"server": "SA.server", "server": "SA.server",
"rpcTimeout": "15s" "rpcTimeout": "15s"