kemitix/git-next
1
1
Fork 1
Code Issues 17 Pull requests 2 Projects 1 Releases 41 Packages 2 Wiki Activity Actions

refactor: use 'server_repo_config' consistently
All checks were successful
ci/woodpecker/push/push-next Pipeline was successful
Details
ci/woodpecker/push/cron-docker-builder Pipeline was successful
Details
ci/woodpecker/push/tag-created Pipeline was successful
Details

Browse source
This commit is contained in:
Paul Campbell 2024-04-20 20:50:50 +01:00
parent 91870055b0
commit 1170510c44
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/server/config/mod.rs
View file

@ -328,15 +328,15 @@ pub struct RepoDetails {
impl RepoDetails { impl RepoDetails {
pub fn new( pub fn new(
name: &RepoAlias, name: &RepoAlias,
repo: &ServerRepoConfig, server_repo_config: &ServerRepoConfig,
forge_name: &ForgeName, forge_name: &ForgeName,
forge: &ForgeConfig, forge: &ForgeConfig,
) -> Self { ) -> Self {
Self { Self {
name: name.clone(), name: name.clone(),
repo: RepoPath(repo.repo.clone()), repo: RepoPath(server_repo_config.repo.clone()),
config: repo.repo_config(), config: server_repo_config.repo_config(),
branch: BranchName(repo.branch.clone()), branch: BranchName(server_repo_config.branch.clone()),
forge: ForgeDetails { forge: ForgeDetails {
name: forge_name.clone(), name: forge_name.clone(),
forge_type: forge.forge_type.clone(), forge_type: forge.forge_type.clone(),

6
src/server/mod.rs
View file

@ -91,12 +91,12 @@ fn create_actor(
) -> impl Fn((RepoAlias, &ServerRepoConfig)) -> (ForgeName, RepoAlias, RepoActor) { ) -> impl Fn((RepoAlias, &ServerRepoConfig)) -> (ForgeName, RepoAlias, RepoActor) {
let webhook = webhook.clone(); let webhook = webhook.clone();
let net = net.clone(); let net = net.clone();
move |(repo_name, repo)| { move |(repo_name, server_repo_config)| {
let span = tracing::info_span!("Repo", %repo_name, %repo); let span = tracing::info_span!("Repo", %repo_name, %server_repo_config);
let _guard = span.enter(); let _guard = span.enter();
info!("Creating Repo"); info!("Creating Repo");
let actor = actors::repo::RepoActor::new( let actor = actors::repo::RepoActor::new(
config::RepoDetails::new(&repo_name, repo, &forge_name, &forge), config::RepoDetails::new(&repo_name, server_repo_config, &forge_name, &forge),
webhook.clone(), webhook.clone(),
net.clone(), net.clone(),
); );