Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
dynamo
Commits
9e6a84af
Unverified
Commit
9e6a84af
authored
Mar 02, 2026
by
Ryan McCormick
Committed by
GitHub
Mar 02, 2026
Browse files
chore(style): Log with {var} style in lib/runtime (#6757)
parent
72eabeae
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
69 additions
and
69 deletions
+69
-69
lib/runtime/src/discovery/kube.rs
lib/runtime/src/discovery/kube.rs
+1
-1
lib/runtime/src/discovery/kube/daemon.rs
lib/runtime/src/discovery/kube/daemon.rs
+4
-4
lib/runtime/src/discovery/mod.rs
lib/runtime/src/discovery/mod.rs
+1
-1
lib/runtime/src/distributed.rs
lib/runtime/src/distributed.rs
+5
-5
lib/runtime/src/engine_routes.rs
lib/runtime/src/engine_routes.rs
+1
-1
lib/runtime/src/local_endpoint_registry.rs
lib/runtime/src/local_endpoint_registry.rs
+1
-1
lib/runtime/src/logging.rs
lib/runtime/src/logging.rs
+3
-3
lib/runtime/src/metrics.rs
lib/runtime/src/metrics.rs
+2
-2
lib/runtime/src/pipeline/network/egress/addressed_router.rs
lib/runtime/src/pipeline/network/egress/addressed_router.rs
+1
-1
lib/runtime/src/pipeline/network/egress/tcp_client.rs
lib/runtime/src/pipeline/network/egress/tcp_client.rs
+5
-5
lib/runtime/src/pipeline/network/ingress/http_endpoint.rs
lib/runtime/src/pipeline/network/ingress/http_endpoint.rs
+4
-4
lib/runtime/src/pipeline/network/ingress/push_handler.rs
lib/runtime/src/pipeline/network/ingress/push_handler.rs
+1
-1
lib/runtime/src/pipeline/network/ingress/shared_tcp_endpoint.rs
...ntime/src/pipeline/network/ingress/shared_tcp_endpoint.rs
+6
-6
lib/runtime/src/pipeline/network/manager.rs
lib/runtime/src/pipeline/network/manager.rs
+1
-1
lib/runtime/src/pipeline/network/tcp/server.rs
lib/runtime/src/pipeline/network/tcp/server.rs
+8
-8
lib/runtime/src/runtime.rs
lib/runtime/src/runtime.rs
+2
-2
lib/runtime/src/system_status_server.rs
lib/runtime/src/system_status_server.rs
+13
-13
lib/runtime/src/transports/etcd.rs
lib/runtime/src/transports/etcd.rs
+5
-5
lib/runtime/src/transports/etcd/lock.rs
lib/runtime/src/transports/etcd/lock.rs
+1
-1
lib/runtime/src/transports/zmq.rs
lib/runtime/src/transports/zmq.rs
+4
-4
No files found.
lib/runtime/src/discovery/kube.rs
View file @
9e6a84af
...
@@ -67,7 +67,7 @@ impl KubeDiscoveryClient {
...
@@ -67,7 +67,7 @@ impl KubeDiscoveryClient {
tokio
::
spawn
(
async
move
{
tokio
::
spawn
(
async
move
{
if
let
Err
(
e
)
=
daemon
.run
(
watch_tx
)
.await
{
if
let
Err
(
e
)
=
daemon
.run
(
watch_tx
)
.await
{
tracing
::
error!
(
"Discovery daemon failed: {}"
,
e
);
tracing
::
error!
(
"Discovery daemon failed: {
e
}"
);
}
}
});
});
...
...
lib/runtime/src/discovery/kube/daemon.rs
View file @
9e6a84af
...
@@ -86,7 +86,7 @@ impl DiscoveryDaemon {
...
@@ -86,7 +86,7 @@ impl DiscoveryDaemon {
notify_ep
.notify_one
();
notify_ep
.notify_one
();
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"EndpointSlice reflector error: {}"
,
e
);
tracing
::
warn!
(
"EndpointSlice reflector error: {
e
}"
);
notify_ep
.notify_one
();
notify_ep
.notify_one
();
}
}
}
}
...
@@ -124,7 +124,7 @@ impl DiscoveryDaemon {
...
@@ -124,7 +124,7 @@ impl DiscoveryDaemon {
notify_cr
.notify_one
();
notify_cr
.notify_one
();
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"DynamoWorkerMetadata CR reflector error: {}"
,
e
);
tracing
::
warn!
(
"DynamoWorkerMetadata CR reflector error: {
e
}"
);
notify_cr
.notify_one
();
notify_cr
.notify_one
();
}
}
}
}
...
@@ -164,7 +164,7 @@ impl DiscoveryDaemon {
...
@@ -164,7 +164,7 @@ impl DiscoveryDaemon {
sequence
+=
1
;
sequence
+=
1
;
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to aggregate snapshot: {}"
,
e
);
tracing
::
error!
(
"Failed to aggregate snapshot: {
e
}"
);
// Continue on errors - don't crash daemon
// Continue on errors - don't crash daemon
}
}
}
}
...
@@ -220,7 +220,7 @@ impl DiscoveryDaemon {
...
@@ -220,7 +220,7 @@ impl DiscoveryDaemon {
// Deserialize the data field to DiscoveryMetadata
// Deserialize the data field to DiscoveryMetadata
match
serde_json
::
from_value
::
<
DiscoveryMetadata
>
(
arc_cr
.spec.data
.clone
())
{
match
serde_json
::
from_value
::
<
DiscoveryMetadata
>
(
arc_cr
.spec.data
.clone
())
{
Ok
(
metadata
)
=>
{
Ok
(
metadata
)
=>
{
tracing
::
trace!
(
"Loaded metadata from CR '{
}'"
,
cr_name
);
tracing
::
trace!
(
"Loaded metadata from CR '{cr_name
}'"
);
cr_map
.insert
(
cr_name
.clone
(),
(
Arc
::
new
(
metadata
),
generation
));
cr_map
.insert
(
cr_name
.clone
(),
(
Arc
::
new
(
metadata
),
generation
));
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
...
...
lib/runtime/src/discovery/mod.rs
View file @
9e6a84af
...
@@ -58,7 +58,7 @@ impl EventTransportKind {
...
@@ -58,7 +58,7 @@ impl EventTransportKind {
/// Logs a warning if an invalid value is encountered.
/// Logs a warning if an invalid value is encountered.
pub
fn
from_env_or_default
()
->
Self
{
pub
fn
from_env_or_default
()
->
Self
{
Self
::
from_env
()
.unwrap_or_else
(|
e
|
{
Self
::
from_env
()
.unwrap_or_else
(|
e
|
{
tracing
::
warn!
(
"{}, defaulting to NATS"
,
e
);
tracing
::
warn!
(
"{
e
}, defaulting to NATS"
);
Self
::
Nats
Self
::
Nats
})
})
}
}
...
...
lib/runtime/src/distributed.rs
View file @
9e6a84af
...
@@ -145,7 +145,7 @@ impl DistributedRuntime {
...
@@ -145,7 +145,7 @@ impl DistributedRuntime {
(
Arc
::
new
(
client
)
as
Arc
<
dyn
Discovery
>
,
Some
(
metadata
))
(
Arc
::
new
(
client
)
as
Arc
<
dyn
Discovery
>
,
Some
(
metadata
))
}
}
DiscoveryBackend
::
KvStore
(
kv_selector
)
=>
{
DiscoveryBackend
::
KvStore
(
kv_selector
)
=>
{
tracing
::
info!
(
"Initializing KV store discovery backend: {
}"
,
kv_selector
);
tracing
::
info!
(
"Initializing KV store discovery backend: {kv_selector
}"
);
let
runtime_clone
=
runtime
.clone
();
let
runtime_clone
=
runtime
.clone
();
let
store
=
match
kv_selector
{
let
store
=
match
kv_selector
{
kv
::
Selector
::
Etcd
(
etcd_config
)
=>
{
kv
::
Selector
::
Etcd
(
etcd_config
)
=>
{
...
@@ -227,7 +227,7 @@ impl DistributedRuntime {
...
@@ -227,7 +227,7 @@ impl DistributedRuntime {
.await
.await
{
{
Ok
((
addr
,
handle
))
=>
{
Ok
((
addr
,
handle
))
=>
{
tracing
::
info!
(
"System status server started successfully on {
}"
,
addr
);
tracing
::
info!
(
"System status server started successfully on {addr
}"
);
// Store system status server information
// Store system status server information
let
system_status_server_info
=
let
system_status_server_info
=
...
@@ -243,7 +243,7 @@ impl DistributedRuntime {
...
@@ -243,7 +243,7 @@ impl DistributedRuntime {
.expect
(
"System status server info should only be set once"
);
.expect
(
"System status server info should only be set once"
);
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"System status server startup failed: {}"
,
e
);
tracing
::
error!
(
"System status server startup failed: {
e
}"
);
}
}
}
}
}
else
{
}
else
{
...
@@ -274,7 +274,7 @@ impl DistributedRuntime {
...
@@ -274,7 +274,7 @@ impl DistributedRuntime {
config
.canary_wait_time_secs
,
config
.canary_wait_time_secs
,
config
.health_check_request_timeout_secs
config
.health_check_request_timeout_secs
),
),
Err
(
e
)
=>
tracing
::
error!
(
"Health check manager failed to start: {}"
,
e
),
Err
(
e
)
=>
tracing
::
error!
(
"Health check manager failed to start: {
e
}"
),
}
}
}
}
...
@@ -402,7 +402,7 @@ impl DistributedRuntime {
...
@@ -402,7 +402,7 @@ impl DistributedRuntime {
)
->
anyhow
::
Result
<
()
>
{
)
->
anyhow
::
Result
<
()
>
{
let
Some
(
nats_client
)
=
self
.nats_client
.as_ref
()
else
{
let
Some
(
nats_client
)
=
self
.nats_client
.as_ref
()
else
{
// NATS not available - this is expected in approximate mode (--no-kv-events)
// NATS not available - this is expected in approximate mode (--no-kv-events)
tracing
::
trace!
(
"Skipping NATS publish (NATS not configured): {
}"
,
subject
);
tracing
::
trace!
(
"Skipping NATS publish (NATS not configured): {subject
}"
);
return
Ok
(());
return
Ok
(());
};
};
Ok
(
nats_client
.client
()
.publish
(
subject
,
payload
)
.await
?
)
Ok
(
nats_client
.client
()
.publish
(
subject
,
payload
)
.await
?
)
...
...
lib/runtime/src/engine_routes.rs
View file @
9e6a84af
...
@@ -37,7 +37,7 @@ impl EngineRouteRegistry {
...
@@ -37,7 +37,7 @@ impl EngineRouteRegistry {
pub
fn
register
(
&
self
,
route
:
&
str
,
callback
:
EngineRouteCallback
)
{
pub
fn
register
(
&
self
,
route
:
&
str
,
callback
:
EngineRouteCallback
)
{
let
mut
routes
=
self
.routes
.write
()
.unwrap
();
let
mut
routes
=
self
.routes
.write
()
.unwrap
();
routes
.insert
(
route
.to_string
(),
callback
);
routes
.insert
(
route
.to_string
(),
callback
);
tracing
::
debug!
(
"Registered engine route: /engine/{
}"
,
route
);
tracing
::
debug!
(
"Registered engine route: /engine/{route
}"
);
}
}
/// Get callback for a route
/// Get callback for a route
...
...
lib/runtime/src/local_endpoint_registry.rs
View file @
9e6a84af
...
@@ -45,7 +45,7 @@ impl LocalEndpointRegistry {
...
@@ -45,7 +45,7 @@ impl LocalEndpointRegistry {
/// * `endpoint_name` - Name of the endpoint (e.g., "load_lora", "generate")
/// * `endpoint_name` - Name of the endpoint (e.g., "load_lora", "generate")
/// * `engine` - The async engine that handles requests for this endpoint
/// * `engine` - The async engine that handles requests for this endpoint
pub
fn
register
(
&
self
,
endpoint_name
:
String
,
engine
:
LocalAsyncEngine
)
{
pub
fn
register
(
&
self
,
endpoint_name
:
String
,
engine
:
LocalAsyncEngine
)
{
tracing
::
debug!
(
"Registering local endpoint: {
}"
,
endpoint_name
);
tracing
::
debug!
(
"Registering local endpoint: {endpoint_name
}"
);
self
.engines
.insert
(
endpoint_name
,
engine
);
self
.engines
.insert
(
endpoint_name
,
engine
);
}
}
...
...
lib/runtime/src/logging.rs
View file @
9e6a84af
...
@@ -683,7 +683,7 @@ where
...
@@ -683,7 +683,7 @@ where
// Extract trace_id from span attributes
// Extract trace_id from span attributes
if
let
Some
(
trace_id_input
)
=
visitor
.fields
.get
(
"trace_id"
)
{
if
let
Some
(
trace_id_input
)
=
visitor
.fields
.get
(
"trace_id"
)
{
if
!
is_valid_trace_id
(
trace_id_input
)
{
if
!
is_valid_trace_id
(
trace_id_input
)
{
tracing
::
trace!
(
"trace id '{}' is not valid! Ignoring."
,
trace_id_input
);
tracing
::
trace!
(
"trace id '{
trace_id_input
}' is not valid! Ignoring."
);
}
else
{
}
else
{
trace_id
=
Some
(
trace_id_input
.to_string
());
trace_id
=
Some
(
trace_id_input
.to_string
());
}
}
...
@@ -692,7 +692,7 @@ where
...
@@ -692,7 +692,7 @@ where
// Extract span_id from span attributes
// Extract span_id from span attributes
if
let
Some
(
span_id_input
)
=
visitor
.fields
.get
(
"span_id"
)
{
if
let
Some
(
span_id_input
)
=
visitor
.fields
.get
(
"span_id"
)
{
if
!
is_valid_span_id
(
span_id_input
)
{
if
!
is_valid_span_id
(
span_id_input
)
{
tracing
::
trace!
(
"span id '{}' is not valid! Ignoring."
,
span_id_input
);
tracing
::
trace!
(
"span id '{
span_id_input
}' is not valid! Ignoring."
);
}
else
{
}
else
{
span_id
=
Some
(
span_id_input
.to_string
());
span_id
=
Some
(
span_id_input
.to_string
());
}
}
...
@@ -701,7 +701,7 @@ where
...
@@ -701,7 +701,7 @@ where
// Extract parent_id from span attributes
// Extract parent_id from span attributes
if
let
Some
(
parent_id_input
)
=
visitor
.fields
.get
(
"parent_id"
)
{
if
let
Some
(
parent_id_input
)
=
visitor
.fields
.get
(
"parent_id"
)
{
if
!
is_valid_span_id
(
parent_id_input
)
{
if
!
is_valid_span_id
(
parent_id_input
)
{
tracing
::
trace!
(
"parent id '{}' is not valid! Ignoring."
,
parent_id_input
);
tracing
::
trace!
(
"parent id '{
parent_id_input
}' is not valid! Ignoring."
);
}
else
{
}
else
{
parent_id
=
Some
(
parent_id_input
.to_string
());
parent_id
=
Some
(
parent_id_input
.to_string
());
}
}
...
...
lib/runtime/src/metrics.rs
View file @
9e6a84af
...
@@ -733,7 +733,7 @@ impl MetricsRegistry {
...
@@ -733,7 +733,7 @@ impl MetricsRegistry {
for
registry
in
&
registries
{
for
registry
in
&
registries
{
for
result
in
registry
.execute_update_callbacks
()
{
for
result
in
registry
.execute_update_callbacks
()
{
if
let
Err
(
e
)
=
result
{
if
let
Err
(
e
)
=
result
{
tracing
::
error!
(
"Error executing metrics callback: {}"
,
e
);
tracing
::
error!
(
"Error executing metrics callback: {
e
}"
);
}
}
}
}
}
}
...
@@ -870,7 +870,7 @@ impl MetricsRegistry {
...
@@ -870,7 +870,7 @@ impl MetricsRegistry {
}
}
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Error executing exposition text callback: {}"
,
e
);
tracing
::
error!
(
"Error executing exposition text callback: {
e
}"
);
}
}
}
}
}
}
...
...
lib/runtime/src/pipeline/network/egress/addressed_router.rs
View file @
9e6a84af
...
@@ -229,7 +229,7 @@ where
...
@@ -229,7 +229,7 @@ where
.error_type
(
ErrorType
::
Disconnected
)
.error_type
(
ErrorType
::
Disconnected
)
.message
(
"Stream ended before generation completed"
)
.message
(
"Stream ended before generation completed"
)
.build
();
.build
();
tracing
::
debug!
(
"{
}"
,
err
);
tracing
::
debug!
(
"{err
}"
);
Some
(
U
::
from_err
(
err
))
Some
(
U
::
from_err
(
err
))
}
}
});
});
...
...
lib/runtime/src/pipeline/network/egress/tcp_client.rs
View file @
9e6a84af
...
@@ -380,14 +380,14 @@ impl TcpConnectionPool {
...
@@ -380,14 +380,14 @@ impl TcpConnectionPool {
if
conn
.is_healthy
()
{
if
conn
.is_healthy
()
{
return
Ok
(
conn
);
return
Ok
(
conn
);
}
else
{
}
else
{
tracing
::
debug!
(
"Discarding unhealthy connection for {
}"
,
addr
);
tracing
::
debug!
(
"Discarding unhealthy connection for {addr
}"
);
// Connection will be dropped here, cleaning up tasks
// Connection will be dropped here, cleaning up tasks
}
}
}
}
}
}
// Create new connection with configured channel buffer
// Create new connection with configured channel buffer
tracing
::
debug!
(
"Creating new TCP connection to {
}"
,
addr
);
tracing
::
debug!
(
"Creating new TCP connection to {addr
}"
);
TcpConnection
::
connect
(
TcpConnection
::
connect
(
addr
,
addr
,
self
.config.connect_timeout
,
self
.config.connect_timeout
,
...
@@ -417,7 +417,7 @@ impl TcpConnectionPool {
...
@@ -417,7 +417,7 @@ impl TcpConnectionPool {
if
pool
.len
()
<
self
.config.pool_size
{
if
pool
.len
()
<
self
.config.pool_size
{
pool
.push
(
conn
);
pool
.push
(
conn
);
}
else
{
}
else
{
tracing
::
debug!
(
"Connection pool full for {}, dropping connection"
,
addr
);
tracing
::
debug!
(
"Connection pool full for {
addr
}, dropping connection"
);
// Otherwise drop the connection (tasks will be cleaned up)
// Otherwise drop the connection (tasks will be cleaned up)
}
}
}
}
...
@@ -503,7 +503,7 @@ impl RequestPlaneClient for TcpRequestClient {
...
@@ -503,7 +503,7 @@ impl RequestPlaneClient for TcpRequestClient {
payload
:
Bytes
,
payload
:
Bytes
,
mut
headers
:
Headers
,
mut
headers
:
Headers
,
)
->
Result
<
Bytes
>
{
)
->
Result
<
Bytes
>
{
tracing
::
debug!
(
"TCP client sending request to address: {
}"
,
address
);
tracing
::
debug!
(
"TCP client sending request to address: {address
}"
);
self
.stats.requests_sent
.fetch_add
(
1
,
Ordering
::
Relaxed
);
self
.stats.requests_sent
.fetch_add
(
1
,
Ordering
::
Relaxed
);
self
.stats
self
.stats
.bytes_sent
.bytes_sent
...
@@ -558,7 +558,7 @@ impl RequestPlaneClient for TcpRequestClient {
...
@@ -558,7 +558,7 @@ impl RequestPlaneClient for TcpRequestClient {
}
}
Err
(
_
)
=>
{
Err
(
_
)
=>
{
self
.stats.errors
.fetch_add
(
1
,
Ordering
::
Relaxed
);
self
.stats.errors
.fetch_add
(
1
,
Ordering
::
Relaxed
);
tracing
::
warn!
(
"TCP request timeout to {
}"
,
addr
);
tracing
::
warn!
(
"TCP request timeout to {addr
}"
);
// Don't return timed-out connection to pool
// Don't return timed-out connection to pool
Err
(
anyhow
::
anyhow!
(
Err
(
anyhow
::
anyhow!
(
crate
::
error
::
DynamoError
::
builder
()
crate
::
error
::
DynamoError
::
builder
()
...
...
lib/runtime/src/pipeline/network/ingress/http_endpoint.rs
View file @
9e6a84af
...
@@ -94,7 +94,7 @@ impl SharedHttpServer {
...
@@ -94,7 +94,7 @@ impl SharedHttpServer {
.lock
()
.lock
()
.set_endpoint_health_status
(
&
endpoint_name
,
HealthStatus
::
Ready
);
.set_endpoint_health_status
(
&
endpoint_name
,
HealthStatus
::
Ready
);
tracing
::
debug!
(
"Registered endpoint handler for subject: {
}"
,
subject_clone
);
tracing
::
debug!
(
"Registered endpoint handler for subject: {subject_clone
}"
);
Ok
(())
Ok
(())
}
}
...
@@ -170,7 +170,7 @@ impl SharedHttpServer {
...
@@ -170,7 +170,7 @@ impl SharedHttpServer {
tokio
::
select!
{
tokio
::
select!
{
result
=
http2_builder
.serve_connection
(
io
,
hyper_service
)
=>
{
result
=
http2_builder
.serve_connection
(
io
,
hyper_service
)
=>
{
if
let
Err
(
e
)
=
result
{
if
let
Err
(
e
)
=
result
{
tracing
::
debug!
(
"HTTP/2 connection error: {}"
,
e
);
tracing
::
debug!
(
"HTTP/2 connection error: {
e
}"
);
}
}
}
}
_
=
cancel_clone
.cancelled
()
=>
{
_
=
cancel_clone
.cancelled
()
=>
{
...
@@ -180,7 +180,7 @@ impl SharedHttpServer {
...
@@ -180,7 +180,7 @@ impl SharedHttpServer {
});
});
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to accept connection: {}"
,
e
);
tracing
::
error!
(
"Failed to accept connection: {
e
}"
);
}
}
}
}
}
}
...
@@ -213,7 +213,7 @@ async fn handle_shared_request(
...
@@ -213,7 +213,7 @@ async fn handle_shared_request(
let
handler
=
match
server
.handlers
.get
(
&
endpoint_path
)
{
let
handler
=
match
server
.handlers
.get
(
&
endpoint_path
)
{
Some
(
h
)
=>
h
.clone
(),
Some
(
h
)
=>
h
.clone
(),
None
=>
{
None
=>
{
tracing
::
warn!
(
"No handler found for endpoint: {
}"
,
endpoint_path
);
tracing
::
warn!
(
"No handler found for endpoint: {endpoint_path
}"
);
return
(
StatusCode
::
NOT_FOUND
,
"Endpoint not found"
);
return
(
StatusCode
::
NOT_FOUND
,
"Endpoint not found"
);
}
}
};
};
...
...
lib/runtime/src/pipeline/network/ingress/push_handler.rs
View file @
9e6a84af
...
@@ -252,7 +252,7 @@ where
...
@@ -252,7 +252,7 @@ where
}
}
#[cfg(not(debug_assertions))]
#[cfg(not(debug_assertions))]
{
{
tracing
::
error!
(
"Failed to generate response stream: {
}"
,
error_string
);
tracing
::
error!
(
"Failed to generate response stream: {error_string
}"
);
}
}
let
_
result
=
publisher
.send_prologue
(
Some
(
error_string
))
.await
;
let
_
result
=
publisher
.send_prologue
(
Some
(
error_string
))
.await
;
...
...
lib/runtime/src/pipeline/network/ingress/shared_tcp_endpoint.rs
View file @
9e6a84af
...
@@ -260,18 +260,18 @@ impl SharedTcpServer {
...
@@ -260,18 +260,18 @@ impl SharedTcpServer {
accept_result
=
listener
.accept
()
=>
{
accept_result
=
listener
.accept
()
=>
{
match
accept_result
{
match
accept_result
{
Ok
((
stream
,
peer_addr
))
=>
{
Ok
((
stream
,
peer_addr
))
=>
{
tracing
::
trace!
(
"Accepted TCP connection from {
}"
,
peer_addr
);
tracing
::
trace!
(
"Accepted TCP connection from {peer_addr
}"
);
let
handlers
=
self
.handlers
.clone
();
let
handlers
=
self
.handlers
.clone
();
let
work_tx
=
self
.work_tx
.clone
();
let
work_tx
=
self
.work_tx
.clone
();
tokio
::
spawn
(
async
move
{
tokio
::
spawn
(
async
move
{
if
let
Err
(
e
)
=
Self
::
handle_connection
(
stream
,
handlers
,
work_tx
)
.await
{
if
let
Err
(
e
)
=
Self
::
handle_connection
(
stream
,
handlers
,
work_tx
)
.await
{
tracing
::
error!
(
"TCP connection error: {}"
,
e
);
tracing
::
error!
(
"TCP connection error: {
e
}"
);
}
}
});
});
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to accept TCP connection: {}"
,
e
);
tracing
::
error!
(
"Failed to accept TCP connection: {
e
}"
);
}
}
}
}
}
}
...
@@ -409,7 +409,7 @@ impl SharedTcpServer {
...
@@ -409,7 +409,7 @@ impl SharedTcpServer {
break
;
break
;
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"Failed to read TCP request: {}"
,
e
);
tracing
::
warn!
(
"Failed to read TCP request: {
e
}"
);
// Send error response
// Send error response
let
error_response
=
let
error_response
=
TcpResponseMessage
::
new
(
Bytes
::
from
(
format!
(
"Read error: {}"
,
e
)));
TcpResponseMessage
::
new
(
Bytes
::
from
(
format!
(
"Read error: {}"
,
e
)));
...
@@ -424,7 +424,7 @@ impl SharedTcpServer {
...
@@ -424,7 +424,7 @@ impl SharedTcpServer {
let
endpoint_path
=
match
request_msg
.endpoint_path
()
{
let
endpoint_path
=
match
request_msg
.endpoint_path
()
{
Ok
(
path
)
=>
path
,
Ok
(
path
)
=>
path
,
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"Invalid UTF-8 in endpoint path: {}"
,
e
);
tracing
::
warn!
(
"Invalid UTF-8 in endpoint path: {
e
}"
);
let
error_response
=
let
error_response
=
TcpResponseMessage
::
new
(
Bytes
::
from_static
(
b
"Invalid endpoint path"
));
TcpResponseMessage
::
new
(
Bytes
::
from_static
(
b
"Invalid endpoint path"
));
if
let
Ok
(
encoded
)
=
error_response
.encode
()
{
if
let
Ok
(
encoded
)
=
error_response
.encode
()
{
...
@@ -453,7 +453,7 @@ impl SharedTcpServer {
...
@@ -453,7 +453,7 @@ impl SharedTcpServer {
let
handler
=
match
handler
{
let
handler
=
match
handler
{
Some
(
h
)
=>
h
,
Some
(
h
)
=>
h
,
None
=>
{
None
=>
{
tracing
::
warn!
(
"No handler found for endpoint: {
}"
,
endpoint_path
);
tracing
::
warn!
(
"No handler found for endpoint: {endpoint_path
}"
);
// Send error response
// Send error response
let
error_response
=
TcpResponseMessage
::
new
(
Bytes
::
from
(
format!
(
let
error_response
=
TcpResponseMessage
::
new
(
Bytes
::
from
(
format!
(
"Unknown endpoint: {}"
,
"Unknown endpoint: {}"
,
...
...
lib/runtime/src/pipeline/network/manager.rs
View file @
9e6a84af
...
@@ -312,7 +312,7 @@ impl NetworkManager {
...
@@ -312,7 +312,7 @@ impl NetworkManager {
let
server_clone
=
server
.clone
();
let
server_clone
=
server
.clone
();
tokio
::
spawn
(
async
move
{
tokio
::
spawn
(
async
move
{
if
let
Err
(
e
)
=
server_clone
.start
()
.await
{
if
let
Err
(
e
)
=
server_clone
.start
()
.await
{
tracing
::
error!
(
"HTTP request plane server error: {}"
,
e
);
tracing
::
error!
(
"HTTP request plane server error: {
e
}"
);
}
}
});
});
...
...
lib/runtime/src/pipeline/network/tcp/server.rs
View file @
9e6a84af
...
@@ -227,7 +227,7 @@ impl ResponseService for TcpStreamServer {
...
@@ -227,7 +227,7 @@ impl ResponseService for TcpStreamServer {
// oneshot channels to pass back the sender and receiver objects
// oneshot channels to pass back the sender and receiver objects
let
address
=
format!
(
"{}:{}"
,
self
.local_ip
,
self
.local_port
);
let
address
=
format!
(
"{}:{}"
,
self
.local_ip
,
self
.local_port
);
tracing
::
debug!
(
"Registering new TcpStream on {
}"
,
address
);
tracing
::
debug!
(
"Registering new TcpStream on {address
}"
);
let
send_stream
=
if
options
.enable_request_stream
{
let
send_stream
=
if
options
.enable_request_stream
{
let
sender_subject
=
uuid
::
Uuid
::
new_v4
()
.to_string
();
let
sender_subject
=
uuid
::
Uuid
::
new_v4
()
.to_string
();
...
@@ -341,7 +341,7 @@ async fn tcp_listener(
...
@@ -341,7 +341,7 @@ async fn tcp_listener(
Ok
((
stream
,
_
addr
))
=>
(
stream
,
_
addr
),
Ok
((
stream
,
_
addr
))
=>
(
stream
,
_
addr
),
Err
(
e
)
=>
{
Err
(
e
)
=>
{
// the client should retry, so we don't need to abort
// the client should retry, so we don't need to abort
tracing
::
warn!
(
"failed to accept tcp connection: {}"
,
e
);
tracing
::
warn!
(
"failed to accept tcp connection: {
e
}"
);
eprintln!
(
"failed to accept tcp connection: {}"
,
e
);
eprintln!
(
"failed to accept tcp connection: {}"
,
e
);
continue
;
continue
;
}
}
...
@@ -350,14 +350,14 @@ async fn tcp_listener(
...
@@ -350,14 +350,14 @@ async fn tcp_listener(
match
stream
.set_nodelay
(
true
)
{
match
stream
.set_nodelay
(
true
)
{
Ok
(
_
)
=>
(),
Ok
(
_
)
=>
(),
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"failed to set tcp stream to nodelay: {}"
,
e
);
tracing
::
warn!
(
"failed to set tcp stream to nodelay: {
e
}"
);
}
}
}
}
match
stream
.set_linger
(
Some
(
std
::
time
::
Duration
::
from_secs
(
0
)))
{
match
stream
.set_linger
(
Some
(
std
::
time
::
Duration
::
from_secs
(
0
)))
{
Ok
(
_
)
=>
(),
Ok
(
_
)
=>
(),
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"failed to set tcp stream to linger: {}"
,
e
);
tracing
::
warn!
(
"failed to set tcp stream to linger: {
e
}"
);
}
}
}
}
...
@@ -371,7 +371,7 @@ async fn tcp_listener(
...
@@ -371,7 +371,7 @@ async fn tcp_listener(
match
result
{
match
result
{
Ok
(
_
)
=>
tracing
::
trace!
(
"successfully processed tcp connection"
),
Ok
(
_
)
=>
tracing
::
trace!
(
"successfully processed tcp connection"
),
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"failed to handle tcp connection: {}"
,
e
);
tracing
::
warn!
(
"failed to handle tcp connection: {
e
}"
);
#[cfg(debug_assertions)]
#[cfg(debug_assertions)]
eprintln!
(
"failed to handle tcp connection: {}"
,
e
);
eprintln!
(
"failed to handle tcp connection: {}"
,
e
);
}
}
...
@@ -561,7 +561,7 @@ async fn tcp_listener(
...
@@ -561,7 +561,7 @@ async fn tcp_listener(
if
!
data
.is_empty
()
if
!
data
.is_empty
()
&&
let
Err
(
err
)
=
response_tx
.send
(
data
)
.await
{
&&
let
Err
(
err
)
=
response_tx
.send
(
data
)
.await
{
tracing
::
debug!
(
"forwarding body/data message to response channel failed: {
}"
,
err
);
tracing
::
debug!
(
"forwarding body/data message to response channel failed: {err
}"
);
control_tx
.send
(
ControlMessage
::
Kill
)
.await
.expect
(
"the control channel should not be closed"
);
control_tx
.send
(
ControlMessage
::
Kill
)
.await
.expect
(
"the control channel should not be closed"
);
break
;
break
;
};
};
...
@@ -612,10 +612,10 @@ async fn tcp_listener(
...
@@ -612,10 +612,10 @@ async fn tcp_listener(
let
mut
inner
=
socket_tx
.into_inner
();
let
mut
inner
=
socket_tx
.into_inner
();
if
let
Err
(
e
)
=
inner
.flush
()
.await
{
if
let
Err
(
e
)
=
inner
.flush
()
.await
{
tracing
::
debug!
(
"failed to flush socket: {}"
,
e
);
tracing
::
debug!
(
"failed to flush socket: {
e
}"
);
}
}
if
let
Err
(
e
)
=
inner
.shutdown
()
.await
{
if
let
Err
(
e
)
=
inner
.shutdown
()
.await
{
tracing
::
debug!
(
"failed to shutdown socket: {}"
,
e
);
tracing
::
debug!
(
"failed to shutdown socket: {
e
}"
);
}
}
}
}
}
}
...
...
lib/runtime/src/runtime.rs
View file @
9e6a84af
...
@@ -230,7 +230,7 @@ impl Runtime {
...
@@ -230,7 +230,7 @@ impl Runtime {
}
}
let
count
=
thread_ids
.lock
()
.len
();
let
count
=
thread_ids
.lock
()
.len
();
tracing
::
debug!
(
"Detected {} worker threads in runtime"
,
count
);
tracing
::
debug!
(
"Detected {
count
} worker threads in runtime"
);
count
count
}
}
...
@@ -318,7 +318,7 @@ impl Runtime {
...
@@ -318,7 +318,7 @@ impl Runtime {
tracing
::
info!
(
"Phase 2: Waiting for graceful endpoints to complete"
);
tracing
::
info!
(
"Phase 2: Waiting for graceful endpoints to complete"
);
let
count
=
tracker
.get_count
();
let
count
=
tracker
.get_count
();
tracing
::
info!
(
"Active graceful endpoints: {
}"
,
count
);
tracing
::
info!
(
"Active graceful endpoints: {count
}"
);
if
count
!=
0
{
if
count
!=
0
{
tracker
.wait_for_completion
()
.await
;
tracker
.wait_for_completion
()
.await
;
...
...
lib/runtime/src/system_status_server.rs
View file @
9e6a84af
...
@@ -224,7 +224,7 @@ pub async fn spawn_system_status_server(
...
@@ -224,7 +224,7 @@ pub async fn spawn_system_status_server(
.layer
(
TraceLayer
::
new_for_http
()
.make_span_with
(
make_request_span
));
.layer
(
TraceLayer
::
new_for_http
()
.make_span_with
(
make_request_span
));
let
address
=
format!
(
"{}:{}"
,
host
,
port
);
let
address
=
format!
(
"{}:{}"
,
host
,
port
);
tracing
::
info!
(
"[spawn_system_status_server] binding to: {
}"
,
address
);
tracing
::
info!
(
"[spawn_system_status_server] binding to: {address
}"
);
let
listener
=
match
TcpListener
::
bind
(
&
address
)
.await
{
let
listener
=
match
TcpListener
::
bind
(
&
address
)
.await
{
Ok
(
listener
)
=>
{
Ok
(
listener
)
=>
{
...
@@ -250,7 +250,7 @@ pub async fn spawn_system_status_server(
...
@@ -250,7 +250,7 @@ pub async fn spawn_system_status_server(
.with_graceful_shutdown
(
observer
.cancelled_owned
())
.with_graceful_shutdown
(
observer
.cancelled_owned
())
.await
.await
{
{
tracing
::
error!
(
"System status server error: {}"
,
e
);
tracing
::
error!
(
"System status server error: {
e
}"
);
}
}
});
});
...
@@ -297,7 +297,7 @@ async fn metrics_handler(state: Arc<SystemStatusState>) -> impl IntoResponse {
...
@@ -297,7 +297,7 @@ async fn metrics_handler(state: Arc<SystemStatusState>) -> impl IntoResponse {
let
response
=
match
state
.drt
()
.metrics
()
.prometheus_expfmt
()
{
let
response
=
match
state
.drt
()
.metrics
()
.prometheus_expfmt
()
{
Ok
(
r
)
=>
r
,
Ok
(
r
)
=>
r
,
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to get metrics from registry: {}"
,
e
);
tracing
::
error!
(
"Failed to get metrics from registry: {
e
}"
);
return
(
return
(
StatusCode
::
INTERNAL_SERVER_ERROR
,
StatusCode
::
INTERNAL_SERVER_ERROR
,
"Failed to get metrics"
.to_string
(),
"Failed to get metrics"
.to_string
(),
...
@@ -334,7 +334,7 @@ async fn metadata_handler(state: Arc<SystemStatusState>) -> impl IntoResponse {
...
@@ -334,7 +334,7 @@ async fn metadata_handler(state: Arc<SystemStatusState>) -> impl IntoResponse {
(
StatusCode
::
OK
,
json
)
.into_response
()
(
StatusCode
::
OK
,
json
)
.into_response
()
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to serialize metadata: {}"
,
e
);
tracing
::
error!
(
"Failed to serialize metadata: {
e
}"
);
(
(
StatusCode
::
INTERNAL_SERVER_ERROR
,
StatusCode
::
INTERNAL_SERVER_ERROR
,
"Failed to serialize metadata"
.to_string
(),
"Failed to serialize metadata"
.to_string
(),
...
@@ -406,7 +406,7 @@ async fn unload_lora_handler(
...
@@ -406,7 +406,7 @@ async fn unload_lora_handler(
.strip_prefix
(
'/'
)
.strip_prefix
(
'/'
)
.unwrap_or
(
&
lora_name
)
.unwrap_or
(
&
lora_name
)
.to_string
();
.to_string
();
tracing
::
info!
(
"Unloading LoRA: {
}"
,
lora_name
);
tracing
::
info!
(
"Unloading LoRA: {lora_name
}"
);
// Call the unload_lora endpoint for each available backend
// Call the unload_lora endpoint for each available backend
match
call_lora_endpoint
(
match
call_lora_endpoint
(
...
@@ -427,7 +427,7 @@ async fn unload_lora_handler(
...
@@ -427,7 +427,7 @@ async fn unload_lora_handler(
);
);
(
StatusCode
::
INTERNAL_SERVER_ERROR
,
Json
(
response
))
(
StatusCode
::
INTERNAL_SERVER_ERROR
,
Json
(
response
))
}
else
{
}
else
{
tracing
::
info!
(
"LoRA unloaded successfully: {
}"
,
lora_name
);
tracing
::
info!
(
"LoRA unloaded successfully: {lora_name
}"
);
(
StatusCode
::
OK
,
Json
(
response
))
(
StatusCode
::
OK
,
Json
(
response
))
}
}
}
}
...
@@ -460,7 +460,7 @@ async fn list_loras_handler(State(state): State<Arc<SystemStatusState>>) -> impl
...
@@ -460,7 +460,7 @@ async fn list_loras_handler(State(state): State<Arc<SystemStatusState>>) -> impl
(
StatusCode
::
OK
,
Json
(
response
))
(
StatusCode
::
OK
,
Json
(
response
))
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
error!
(
"Failed to list LoRAs: {}"
,
e
);
tracing
::
error!
(
"Failed to list LoRAs: {
e
}"
);
(
(
StatusCode
::
INTERNAL_SERVER_ERROR
,
StatusCode
::
INTERNAL_SERVER_ERROR
,
Json
(
LoraResponse
{
Json
(
LoraResponse
{
...
@@ -487,7 +487,7 @@ async fn call_lora_endpoint(
...
@@ -487,7 +487,7 @@ async fn call_lora_endpoint(
)
->
anyhow
::
Result
<
LoraResponse
>
{
)
->
anyhow
::
Result
<
LoraResponse
>
{
use
crate
::
engine
::
AsyncEngine
;
use
crate
::
engine
::
AsyncEngine
;
tracing
::
debug!
(
"Calling local endpoint: '{
}'"
,
endpoint_name
);
tracing
::
debug!
(
"Calling local endpoint: '{endpoint_name
}'"
);
// Get the endpoint from the local registry (in-process call only)
// Get the endpoint from the local registry (in-process call only)
let
local_registry
=
drt
.local_endpoint_registry
();
let
local_registry
=
drt
.local_endpoint_registry
();
...
@@ -558,7 +558,7 @@ async fn engine_route_handler(
...
@@ -558,7 +558,7 @@ async fn engine_route_handler(
Path
(
path
):
Path
<
String
>
,
Path
(
path
):
Path
<
String
>
,
body
:
Bytes
,
body
:
Bytes
,
)
->
impl
IntoResponse
{
)
->
impl
IntoResponse
{
tracing
::
trace!
(
"Engine route request to /engine/{
}"
,
path
);
tracing
::
trace!
(
"Engine route request to /engine/{path
}"
);
// Parse body as JSON (empty object for GET/empty body)
// Parse body as JSON (empty object for GET/empty body)
let
body_json
:
serde_json
::
Value
=
if
body
.is_empty
()
{
let
body_json
:
serde_json
::
Value
=
if
body
.is_empty
()
{
...
@@ -567,7 +567,7 @@ async fn engine_route_handler(
...
@@ -567,7 +567,7 @@ async fn engine_route_handler(
match
serde_json
::
from_slice
(
&
body
)
{
match
serde_json
::
from_slice
(
&
body
)
{
Ok
(
json
)
=>
json
,
Ok
(
json
)
=>
json
,
Err
(
e
)
=>
{
Err
(
e
)
=>
{
tracing
::
warn!
(
"Invalid JSON in request body: {}"
,
e
);
tracing
::
warn!
(
"Invalid JSON in request body: {
e
}"
);
return
(
return
(
StatusCode
::
BAD_REQUEST
,
StatusCode
::
BAD_REQUEST
,
json!
({
json!
({
...
@@ -585,7 +585,7 @@ async fn engine_route_handler(
...
@@ -585,7 +585,7 @@ async fn engine_route_handler(
let
callback
=
match
state
.drt
()
.engine_routes
()
.get
(
&
path
)
{
let
callback
=
match
state
.drt
()
.engine_routes
()
.get
(
&
path
)
{
Some
(
cb
)
=>
cb
,
Some
(
cb
)
=>
cb
,
None
=>
{
None
=>
{
tracing
::
debug!
(
"Route /engine/{} not found"
,
path
);
tracing
::
debug!
(
"Route /engine/{
path
} not found"
);
return
(
return
(
StatusCode
::
NOT_FOUND
,
StatusCode
::
NOT_FOUND
,
json!
({
json!
({
...
@@ -601,7 +601,7 @@ async fn engine_route_handler(
...
@@ -601,7 +601,7 @@ async fn engine_route_handler(
// Call callback (it's async, so await it)
// Call callback (it's async, so await it)
match
callback
(
body_json
)
.await
{
match
callback
(
body_json
)
.await
{
Ok
(
response
)
=>
{
Ok
(
response
)
=>
{
tracing
::
trace!
(
"Engine route handler succeeded for /engine/{
}"
,
path
);
tracing
::
trace!
(
"Engine route handler succeeded for /engine/{path
}"
);
(
StatusCode
::
OK
,
response
.to_string
())
.into_response
()
(
StatusCode
::
OK
,
response
.to_string
())
.into_response
()
}
}
Err
(
e
)
=>
{
Err
(
e
)
=>
{
...
@@ -1032,7 +1032,7 @@ mod integration_tests {
...
@@ -1032,7 +1032,7 @@ mod integration_tests {
}
}
}
}
tracing
::
info!
(
"Health endpoint test results: {}/200 requests succeeded"
,
success_count
);
tracing
::
info!
(
"Health endpoint test results: {
success_count
}/200 requests succeeded"
);
if
!
failures
.is_empty
()
{
if
!
failures
.is_empty
()
{
tracing
::
warn!
(
"Failed requests: {}"
,
failures
.len
());
tracing
::
warn!
(
"Failed requests: {}"
,
failures
.len
());
}
}
...
...
lib/runtime/src/transports/etcd.rs
View file @
9e6a84af
...
@@ -444,7 +444,7 @@ impl Client {
...
@@ -444,7 +444,7 @@ impl Client {
.await
.await
{
{
Ok
((
_
,
watch_stream
))
=>
{
Ok
((
_
,
watch_stream
))
=>
{
tracing
::
debug!
(
"Watch stream established for prefix '{
}'"
,
prefix
);
tracing
::
debug!
(
"Watch stream established for prefix '{prefix
}'"
);
return
Ok
(
watch_stream
);
return
Ok
(
watch_stream
);
}
}
Err
(
err
)
=>
{
Err
(
err
)
=>
{
...
@@ -486,7 +486,7 @@ impl Client {
...
@@ -486,7 +486,7 @@ impl Client {
return
true
;
// Exit to reconnect
return
true
;
// Exit to reconnect
}
}
None
=>
{
None
=>
{
tracing
::
warn!
(
"Watch stream unexpectedly closed for prefix '{
}'"
,
prefix
);
tracing
::
warn!
(
"Watch stream unexpectedly closed for prefix '{prefix
}'"
);
return
true
;
// Exit to reconnect
return
true
;
// Exit to reconnect
}
}
};
};
...
@@ -495,7 +495,7 @@ impl Client {
...
@@ -495,7 +495,7 @@ impl Client {
*
start_revision
=
match
response
.header
()
{
*
start_revision
=
match
response
.header
()
{
Some
(
header
)
=>
header
.revision
()
+
1
,
Some
(
header
)
=>
header
.revision
()
+
1
,
None
=>
{
None
=>
{
tracing
::
error!
(
"Missing header in watch response for prefix '{
}'"
,
prefix
);
tracing
::
error!
(
"Missing header in watch response for prefix '{prefix
}'"
);
return
false
;
return
false
;
}
}
};
};
...
@@ -692,14 +692,14 @@ impl KvCache {
...
@@ -692,14 +692,14 @@ impl KvCache {
WatchEvent
::
Delete
(
kv
)
=>
{
WatchEvent
::
Delete
(
kv
)
=>
{
let
key
=
String
::
from_utf8_lossy
(
kv
.key
())
.to_string
();
let
key
=
String
::
from_utf8_lossy
(
kv
.key
())
.to_string
();
tracing
::
trace!
(
"KvCache delete: {
}"
,
key
);
tracing
::
trace!
(
"KvCache delete: {key
}"
);
let
mut
cache_write
=
cache
.write
()
.await
;
let
mut
cache_write
=
cache
.write
()
.await
;
cache_write
.remove
(
&
key
);
cache_write
.remove
(
&
key
);
}
}
}
}
}
}
tracing
::
debug!
(
"KvCache watcher for prefix '{}' stopped"
,
prefix
);
tracing
::
debug!
(
"KvCache watcher for prefix '{
prefix
}' stopped"
);
});
});
}
}
...
...
lib/runtime/src/transports/etcd/lock.rs
View file @
9e6a84af
...
@@ -222,7 +222,7 @@ impl DistributedRWLock {
...
@@ -222,7 +222,7 @@ impl DistributedRWLock {
// Execute the atomic transaction
// Execute the atomic transaction
match
etcd_client
.etcd_client
()
.kv_client
()
.txn
(
txn
)
.await
{
match
etcd_client
.etcd_client
()
.kv_client
()
.txn
(
txn
)
.await
{
Ok
(
response
)
if
response
.succeeded
()
=>
{
Ok
(
response
)
if
response
.succeeded
()
=>
{
tracing
::
debug!
(
"Acquired read lock for reader {
}"
,
reader_id
);
tracing
::
debug!
(
"Acquired read lock for reader {reader_id
}"
);
return
Ok
(
ReadLockGuard
{
return
Ok
(
ReadLockGuard
{
rwlock
:
self
,
rwlock
:
self
,
etcd_client
,
etcd_client
,
...
...
lib/runtime/src/transports/zmq.rs
View file @
9e6a84af
...
@@ -115,11 +115,11 @@ impl Server {
...
@@ -115,11 +115,11 @@ impl Server {
// but we also propagate the error to the caller's cancellation token
// but we also propagate the error to the caller's cancellation token
let
watch_task
=
tokio
::
spawn
(
async
move
{
let
watch_task
=
tokio
::
spawn
(
async
move
{
let
result
=
primary_task
.await
.inspect_err
(|
e
|
{
let
result
=
primary_task
.await
.inspect_err
(|
e
|
{
tracing
::
error!
(
"zmq server/router task failed: {}"
,
e
);
tracing
::
error!
(
"zmq server/router task failed: {
e
}"
);
cancel_token
.cancel
();
cancel_token
.cancel
();
})
?
;
})
?
;
result
.inspect_err
(|
e
|
{
result
.inspect_err
(|
e
|
{
tracing
::
error!
(
"zmq server/router task failed: {}"
,
e
);
tracing
::
error!
(
"zmq server/router task failed: {
e
}"
);
cancel_token
.cancel
();
cancel_token
.cancel
();
})
})
});
});
...
@@ -155,7 +155,7 @@ impl Server {
...
@@ -155,7 +155,7 @@ impl Server {
// let port = addr.as_socket().map(|s| s.port());
// let port = addr.as_socket().map(|s| s.port());
// if let Some(port) = port {
// if let Some(port) = port {
// tracing::info!("Server listening on port {
}",
port);
// tracing::info!("Server listening on port {port
}"
);
// }
// }
loop
{
loop
{
...
@@ -168,7 +168,7 @@ impl Server {
...
@@ -168,7 +168,7 @@ impl Server {
frames
frames
},
},
Some
(
Err
(
e
))
=>
{
Some
(
Err
(
e
))
=>
{
tracing
::
warn!
(
"Error receiving message: {}"
,
e
);
tracing
::
warn!
(
"Error receiving message: {
e
}"
);
continue
;
continue
;
}
}
None
=>
break
,
None
=>
break
,
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment