Skip to content

Commit a46d309

Browse files
author
Roland Bracewell Shoemaker
authored
Purge remaining AMQP code (letsencrypt#2648)
Deletes github.com/streadway/amqp and the various RabbitMQ setup tools etc. Changes how listenbuddy is used to proxy all of the gRPC client -> server connections so we test reconnection logic. +49 -8,221 😁 Fixes letsencrypt#2640 and letsencrypt#2562.
1 parent ccf8c45 commit a46d309

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+49
-8221
lines changed

‎Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ WORKDIR /go/src/github.com/letsencrypt/boulder
1717
# Copy in the Boulder sources
1818
COPY . .
1919
RUN mkdir bin
20-
RUN GOBIN=/usr/local/bin go install ./cmd/rabbitmq-setup
2120

2221
RUN chown -R buser /go/
2322

‎Godeps/Godeps.json‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/rabbitmq-setup/main.go‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎docker-compose.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ boulder:
3535
links:
3636
- bhsm:boulder-hsm
3737
- bmysql:boulder-mysql
38-
- brabbitmq:boulder-rabbitmq
3938
bhsm:
4039
# To minimize the fetching of various layers this should match
4140
# the FROM image and tag in boulder/Dockerfile
@@ -52,12 +51,6 @@ bmysql:
5251
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
5352
command: mysqld --bind-address=0.0.0.0
5453
log_driver: none
55-
brabbitmq:
56-
image: rabbitmq:3
57-
net: bridge
58-
environment:
59-
RABBITMQ_NODE_IP_ADDRESS: "0.0.0.0"
60-
log_driver: none
6154
prom:
6255
image: prom/prometheus
6356
net: bridge

‎docs/rabbitmq_acl_configure.sh‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎test/config-next/admin-revoker.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"keyFile": "test/grpc-creds/admin-revoker.boulder/key.pem"
99
},
1010
"raService": {
11-
"serverAddresses": ["ra.boulder:9094"],
11+
"serverAddresses": ["ra.boulder:19094"],
1212
"timeout": "15s"
1313
},
1414
"saService": {
15-
"serverAddresses": ["sa.boulder:9095"],
15+
"serverAddresses": ["sa.boulder:19095"],
1616
"timeout": "15s"
1717
}
1818
},

‎test/config-next/ca.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"keyFile": "test/grpc-creds/ca.boulder/key.pem"
1111
},
1212
"saService": {
13-
"serverAddresses": ["sa.boulder:9095"],
13+
"serverAddresses": ["sa.boulder:19095"],
1414
"timeout": "15s"
1515
},
1616
"grpcCA": {

‎test/config-next/expiration-mailer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"keyFile": "test/grpc-creds/expiration-mailer.boulder/key.pem"
1919
},
2020
"saService": {
21-
"serverAddresses": ["sa.boulder:9095"],
21+
"serverAddresses": ["sa.boulder:19095"],
2222
"timeout": "15s"
2323
},
2424
"frequency": "1h"

‎test/config-next/ocsp-updater.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"keyFile": "test/grpc-creds/ocsp-updater.boulder/key.pem"
2424
},
2525
"publisher": {
26-
"serverAddresses": ["publisher.boulder:9091"],
26+
"serverAddresses": ["publisher.boulder:19091"],
2727
"timeout": "10s"
2828
},
2929
"saService": {
30-
"serverAddresses": ["sa.boulder:9095"],
30+
"serverAddresses": ["sa.boulder:19095"],
3131
"timeout": "15s"
3232
},
3333
"ocspGeneratorService": {
34-
"serverAddresses": ["ca.boulder:9096"],
34+
"serverAddresses": ["ca.boulder:19096"],
3535
"timeout": "15s"
3636
},
3737
"features": {

‎test/config-next/orphan-finder.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616

1717
"saService": {
18-
"serverAddresses": ["sa.boulder:9095"],
18+
"serverAddresses": ["sa.boulder:19095"],
1919
"timeout": "15s"
2020
}
2121
}

0 commit comments

Comments
 (0)