Skip to content

Commit

Permalink
cargo make fix
Browse files Browse the repository at this point in the history
  • Loading branch information
senia-psm committed May 6, 2024
1 parent 5061257 commit 34a82fe
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
10 changes: 1 addition & 9 deletions golem-cli/src/clients/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,7 @@ fn display_worker_service_errors_body(error: WorkerServiceErrorsBody) -> String
WorkerServiceErrorsBody::Validation(validation) => validation
.errors
.iter()
.map(|e| {
format!(
"{}/{}/{}/{}",
e.method.to_string(),
e.path,
e.component,
e.detail
)
})
.map(|e| format!("{}/{}/{}/{}", e.method, e.path, e.component, e.detail))
.join("\n"),
}
}
Expand Down
2 changes: 1 addition & 1 deletion golem-cli/tests/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub fn make_component_from_file(
"component",
"add",
&cfg.arg('c', "component-name"),
&component_name,
component_name,
env_service.to_str().unwrap(),
])
}
Expand Down
4 changes: 2 additions & 2 deletions golem-common/src/redis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ impl RedisPool {
let mut redis_config = RedisConfig::from_url(config.url().as_str())?;
redis_config.tracing = TracingConfig::new(config.tracing);
redis_config.tracing.default_tracing_level = Level::DEBUG;
redis_config.username = config.username.clone();
redis_config.password = config.password.clone();
redis_config.username.clone_from(&config.username);
redis_config.password.clone_from(&config.password);

let policy = ReconnectPolicy::new_exponential(
config.retries.max_attempts,
Expand Down
4 changes: 3 additions & 1 deletion golem-worker-executor-base/src/durable_host/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,9 @@ impl<Ctx: WorkerCtx> DurableWorkerCtx<Ctx> {
deleted_regions.set_override(extra_deleted_regions);

status.deleted_regions = deleted_regions;
status.overridden_retry_config = self.state.overridden_retry_policy.clone();
status
.overridden_retry_config
.clone_from(&self.state.overridden_retry_policy);
status.pending_invocations = self.public_state.invocation_queue().pending_invocations();
status.pending_updates = pending_updates;
status.oplog_idx = self.state.oplog.current_oplog_index().await;
Expand Down

0 comments on commit 34a82fe

Please sign in to comment.