Skip to content

Commit

Permalink
Revert "Compress CLI code push and pull with brotli (#22879)" (#23219)
Browse files Browse the repository at this point in the history
This reverts commit cf28f1fd554d75551df00c8fc5cbcc5855d6b4a7.

GitOrigin-RevId: c80aec497e5783b8feb124384b4a82777e860e23
  • Loading branch information
thomasballinger authored and Convex, Inc. committed Mar 9, 2024
1 parent c93d01a commit a8a0d09
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 61 deletions.
40 changes: 0 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ tonic-build = "0.10.0"
tonic-health = "0.10.0"
tower = { version = "0.4", features = [ "limit", "timeout" ] }
tower-cookies = "0.9"
tower-http = { version = "0.4", features = [ "trace", "cors", "decompression-br", "compression-br" ] }
tower-http = { version = "0.4", features = [ "trace", "cors" ] }
tracing = "0.1"
tracing-appender = { version = "0.2" }
tracing-subscriber = { version = "0.3.17", features = [ "env-filter", "json" ] }
Expand Down
24 changes: 4 additions & 20 deletions crates/local_backend/src/router.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
use std::time::Duration;

use axum::{
error_handling::HandleErrorLayer,
extract::DefaultBodyLimit,
routing::{
get,
post,
},
BoxError,
Router,
};
use common::{
Expand All @@ -28,17 +26,12 @@ use http::{
request,
HeaderValue,
Method,
StatusCode,
};
use isolate::HTTP_ACTION_BODY_LIMIT;
use tower::ServiceBuilder;
use tower_http::{
compression::CompressionLayer,
cors::{
AllowOrigin,
CorsLayer,
},
decompression::RequestDecompressionLayer,
use tower_http::cors::{
AllowOrigin,
CorsLayer,
};

use crate::{
Expand Down Expand Up @@ -132,17 +125,8 @@ pub async fn router(st: LocalAppState) -> Router {
let cli_routes = Router::new()
.route("/push_config", post(push_config))
.route("/prepare_schema", post(prepare_schema))
.layer(
ServiceBuilder::new()
.layer(HandleErrorLayer::new(|_: BoxError| async {
StatusCode::INTERNAL_SERVER_ERROR
}))
.layer(RequestDecompressionLayer::new())
.layer(CompressionLayer::new())
.layer(DefaultBodyLimit::max(MAX_PUSH_BYTES)),
)
.layer(DefaultBodyLimit::max(MAX_PUSH_BYTES))
.route("/get_config", post(get_config))
.layer(CompressionLayer::new())
.route("/schema_state/:schema_id", get(schema_state))
.route("/stream_udf_execution", get(stream_udf_execution))
.merge(import_routes())
Expand Down

0 comments on commit a8a0d09

Please sign in to comment.