Skip to content

Commit 29c2548

Browse files
committed
Fix issue processing email invitations
Signed-off-by: Sergio Castaño Arteaga <[email protected]>
1 parent a7b6ac3 commit 29c2548

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

clowarden-core/src/services/github/state.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use octorust::types::{
2020
use regex::Regex;
2121
use serde::{Deserialize, Serialize};
2222
use serde_json::json;
23-
use tracing::trace;
2423

2524
use crate::{
2625
cfg::Legacy,
@@ -148,15 +147,16 @@ impl State {
148147
for team in stream::iter(svc.list_teams(ctx).await?)
149148
.map(|team| async {
150149
// Get maintainers and members (including pending invitations)
151-
trace!(team = %team.slug, "getting team maintainers");
152150
let mut maintainers: Vec<UserName> =
153151
svc.list_team_maintainers(ctx, &team.slug).await?.into_iter().map(|u| u.login).collect();
154-
trace!(team = %team.slug, "getting team members");
155152
let mut members: Vec<UserName> =
156153
svc.list_team_members(ctx, &team.slug).await?.into_iter().map(|u| u.login).collect();
157-
trace!(team = %team.slug, "getting team invitations");
158154
for invitation in svc.list_team_invitations(ctx, &team.slug).await? {
159-
trace!(team = %team.slug, login = %invitation.login, "getting team membership");
155+
// Skip invitations without login (e.g. email invitations)
156+
if invitation.login.is_empty() {
157+
continue;
158+
}
159+
160160
let membership = svc.get_team_membership(ctx, &team.slug, &invitation.login).await?;
161161
if membership.state == OrgMembershipState::Pending {
162162
match membership.role {

clowarden-server/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async fn main() -> Result<()> {
4848

4949
// Setup logging
5050
if std::env::var_os("RUST_LOG").is_none() {
51-
std::env::set_var("RUST_LOG", "clowarden=trace");
51+
std::env::set_var("RUST_LOG", "clowarden=debug");
5252
}
5353
let ts = tracing_subscriber::fmt().with_env_filter(EnvFilter::from_default_env());
5454
match cfg.log.format {

0 commit comments

Comments
 (0)