Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/local_backend/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use cmd_util::env::config_service;
use common::{
errors::MainError,
http::ConvexHttpService,
knobs::HTTP_SERVER_TIMEOUT_DURATION,
runtime::Runtime,
sentry::set_sentry_tags,
shutdown::ShutdownSignal,
Expand Down Expand Up @@ -134,7 +135,7 @@ async fn run_server_inner(runtime: ProdRuntime, config: LocalConfig) -> anyhow::
"backend",
SERVER_VERSION_STR.to_string(),
MAX_CONCURRENT_REQUESTS,
Duration::from_secs(125),
*HTTP_SERVER_TIMEOUT_DURATION,
HttpActionRouteMapper,
);
let serve_http_future = http_service.serve(config.http_bind_address().into(), async move {
Expand Down
18 changes: 9 additions & 9 deletions crates/local_backend/src/proxy.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use std::{
net::SocketAddr,
time::Duration,
};
use std::net::SocketAddr;

use axum::{
extract::{
Expand All @@ -12,10 +9,13 @@ use axum::{
routing::get,
Router,
};
use common::http::{
ConvexHttpService,
HttpResponseError,
NoopRouteMapper,
use common::{
http::{
ConvexHttpService,
HttpResponseError,
NoopRouteMapper,
},
knobs::HTTP_SERVER_TIMEOUT_DURATION,
};
use hyper_util::rt::TokioExecutor;

Expand Down Expand Up @@ -60,7 +60,7 @@ pub async fn dev_site_proxy(
"backend_http_proxy",
"unknown".to_string(),
4,
Duration::from_secs(125),
*HTTP_SERVER_TIMEOUT_DURATION,
NoopRouteMapper,
);
let proxy_server = service.serve(addr.into(), async move {
Expand Down
1 change: 1 addition & 0 deletions self-hosted/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ services:
- DISABLE_BEACON
- DOCUMENT_RETENTION_DELAY=${DOCUMENT_RETENTION_DELAY:-172800} # Lower default document retention to 2 days
- DO_NOT_REQUIRE_SSL
- HTTP_SERVER_TIMEOUT_SECONDS
- INSTANCE_NAME
- INSTANCE_SECRET
- MYSQL_URL
Expand Down