diff --git a/syndicate-server/src/dependencies.rs b/syndicate-server/src/dependencies.rs index d8d2ddd..c7869e7 100644 --- a/syndicate-server/src/dependencies.rs +++ b/syndicate-server/src/dependencies.rs @@ -54,8 +54,8 @@ fn run(t: &mut Activation, ds: Arc, service_name: AnyValue) -> ActorResult } let obstacle_count = t.named_field("obstacle_count", 1isize); - t.dataflow(enclose!((obstacle_count) move |t| { - tracing::trace!(obstacle_count = ?t.get(&obstacle_count)); + t.dataflow(enclose!((service_name, obstacle_count) move |t| { + tracing::trace!(?service_name, obstacle_count = ?t.get(&obstacle_count)); Ok(()) }))?; @@ -74,24 +74,25 @@ fn run(t: &mut Activation, ds: Arc, service_name: AnyValue) -> ActorResult }) })?; + let depender = service_name.clone(); enclose!((ds, obstacle_count) during!( - t, ds, language(), , - enclose!((ds, obstacle_count) move |t: &mut Activation| { + t, ds, language(), , + enclose!((service_name, ds, obstacle_count) move |t: &mut Activation| { if let Ok(dependee) = language().parse::(&dependee) { - tracing::trace!(on = ?dependee, "new dependency"); + tracing::trace!(?service_name, ?dependee, "new dependency"); ds.assert(t, language(), &service::RequireService { service_name: dependee.service_name, }); } else { - tracing::warn!(on = ?dependee, "cannot deduce dependee service name"); + tracing::warn!(?service_name, ?dependee, "cannot deduce dependee service name"); } counter::adjust(t, &obstacle_count, 1); let d = &dependee.clone(); during!(t, ds, language(), #d, enclose!( - (obstacle_count, dependee) move |t: &mut Activation| { - tracing::trace!(on = ?dependee, "dependency satisfied"); + (service_name, obstacle_count, dependee) move |t: &mut Activation| { + tracing::trace!(?service_name, ?dependee, "dependency satisfied"); counter::adjust(t, &obstacle_count, -1); Ok(()) }));