WIP
All checks were successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful
ci/woodpecker/push/cron-docker-builder Pipeline was successful

This commit is contained in:
Paul Campbell 2024-07-22 07:12:35 +01:00
parent 7365b619fe
commit e3a36d4c24
3 changed files with 6 additions and 3 deletions

View file

@ -468,7 +468,7 @@ mod server {
let http = &server_config.http()?;
let http_addr = http.ip();
let http_port = server_config.http()?.port();
let webhook_url = server_config.webhook().base_url();
let webhook_url = server_config.inbound_webhook().base_url();
let storage_path = server_config.storage().path();
let notification_webhook_url = server_config
.notification()

View file

@ -22,7 +22,7 @@ impl Handler<NotifyUser> for ServerActor {
let timestamp = timestamp.unix_timestamp();
let to_sign = format!("{message_id}.{timestamp}.{payload}");
tracing::info!(?to_sign, "");
let Some(webhook) = notification.webhook.as_ref() else {
let Some(webhook) = notification.webhook() else {
tracing::warn!("Invalid notification configuration - can't sent notification");
return;
};

View file

@ -14,6 +14,7 @@ use git_next_repo_actor::messages::NotifyUser;
use git_next_repo_actor::{messages::CloneRepo, RepoActor};
use git_next_webhook_actor as webhook;
use kxio::{fs::FileSystem, network::Network};
use standardwebhooks::Webhook;
use std::{
collections::BTreeMap,
path::PathBuf,
@ -53,6 +54,7 @@ pub struct ServerActor {
repository_factory: Box<dyn RepositoryFactory>,
sleep_duration: std::time::Duration,
repo_actors: BTreeMap<(ForgeAlias, RepoAlias), Addr<RepoActor>>,
webhook: Option<Webhook>,
// testing
message_log: Option<Arc<RwLock<Vec<String>>>>,
@ -70,6 +72,7 @@ impl ServerActor {
) -> Self {
let generation = Generation::default();
Self {
server_config: None,
generation,
webhook_actor_addr: None,
fs,
@ -77,7 +80,7 @@ impl ServerActor {
repository_factory: repo,
sleep_duration,
repo_actors: BTreeMap::new(),
server_config: None,
webhook: None,
message_log: None,
}
}