Skip to content

Commit 896f7aa

Browse files
committed
Auto merge of #3436 - Turbo87:civet, r=jtgeibel
Remove `civet` server option as discussed in our weekly team meeting today :) Resolves #2204
2 parents 42aafa2 + 04e2550 commit 896f7aa

File tree

4 files changed

+58
-159
lines changed

4 files changed

+58
-159
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ anyhow = "1.0"
3434
base64 = "0.13"
3535
cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
3636
chrono = { version = "0.4.0", features = ["serde"] }
37-
civet = "0.12.0-alpha.5"
3837
clap = "=3.0.0-beta.2"
3938
comrak = { version = "0.9", default-features = false }
4039

@@ -48,7 +47,6 @@ conduit-router = "0.9.0-alpha.6"
4847
conduit-static = "0.9.0-alpha.3"
4948

5049
cookie = { version = "0.15", features = ["secure"] }
51-
ctrlc = { version = "3.0", features = ["termination"] }
5250
dashmap = { version = "4.0.2", features = ["raw-api"] }
5351
derive_deref = "1.1.1"
5452
dialoguer = "0.7.1"

docs/BACKEND.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ The server does the following things:
1212
3. Reads values from environment variables to configure a new instance of `cargo_registry::App`
1313
4. Adds middleware to the app by calling `cargo_registry::middleware`
1414
5. Syncs the categories defined in *src/categories.toml* with the categories in the database
15-
6. Starts either a [conduit] or a [hyper] server that uses the `cargo_registry::App` instance
15+
6. Starts a [hyper] server that uses the `cargo_registry::App` instance
1616
7. Tells Nginx on Heroku that the application is ready to receive requests, if running on Heroku
1717
8. Blocks forever (or until the process is killed)
1818

19-
[civet]: https://crates.io/crates/civet
2019
[hyper]: https://crates.io/crates/hyper
2120

2221
## Routes

0 commit comments

Comments
 (0)