From 3c42b5eaeb20e501a7ea9f9ab6b56c26a0a7d8a7 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Thu, 7 Oct 2021 22:21:38 +0200
Subject: [PATCH] Tweak logging

---
 syndicate-server/src/dependencies.rs                 | 2 +-
 syndicate-server/src/services/config_watcher.rs      | 7 +++++--
 syndicate-server/src/services/daemon.rs              | 2 +-
 syndicate-server/src/services/milestone.rs           | 4 +++-
 syndicate-server/src/services/unix_relay_listener.rs | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/syndicate-server/src/dependencies.rs b/syndicate-server/src/dependencies.rs
index a109862..fa1d9d6 100644
--- a/syndicate-server/src/dependencies.rs
+++ b/syndicate-server/src/dependencies.rs
@@ -18,7 +18,7 @@ use syndicate_macros::during;
 pub fn boot(t: &mut Activation, ds: Arc<Cap>) {
     t.spawn(syndicate::name!("tracker", module = module_path!()), move |t| {
         Ok(during!(t, ds, language(), <require-service $spec>, |t: &mut Activation| {
-            tracing::info!(?spec, "tracking dependencies");
+            tracing::debug!(?spec, "tracking dependencies");
             t.spawn_link(syndicate::name!(parent: None, "tracker", spec = ?spec),
                          enclose!((ds) |t| run(t, ds, spec)));
             Ok(())
diff --git a/syndicate-server/src/services/config_watcher.rs b/syndicate-server/src/services/config_watcher.rs
index 757f8cb..39376c6 100644
--- a/syndicate-server/src/services/config_watcher.rs
+++ b/syndicate-server/src/services/config_watcher.rs
@@ -36,7 +36,7 @@ pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>) {
         Ok(during!(t, config_ds, language(), <run-service $spec: internal_services::ConfigWatcher>, |t| {
             Supervisor::start(
                 t,
-                syndicate::name!(parent: None, "config", spec = ?spec),
+                syndicate::name!(parent: None, "config", path = ?spec.path),
                 SupervisorConfiguration::default(),
                 enclose!((config_ds, spec) lifecycle::updater(config_ds, spec)),
                 enclose!((config_ds) move |t| enclose!((config_ds, spec) run(t, config_ds, spec))))
@@ -163,14 +163,17 @@ fn run(
     let path = fs::canonicalize(spec.path.clone())?;
     let env = script::Env::new(path, spec.env.0.clone());
 
-    tracing::info!("watching {:?}", &env.path);
+    tracing::info!(?env);
     let (tx, rx) = channel();
 
     let mut watcher = watcher(tx, Duration::from_millis(100)).map_err(convert_notify_error)?;
     watcher.watch(&env.path, RecursiveMode::Recursive).map_err(convert_notify_error)?;
 
     let facet = t.facet.clone();
+    let span = tracing::Span::current();
     thread::spawn(move || {
+        let _entry = span.enter();
+
         let mut path_state: Map<PathBuf, FacetId> = Map::new();
 
         {
diff --git a/syndicate-server/src/services/daemon.rs b/syndicate-server/src/services/daemon.rs
index a7a135a..37b3dd5 100644
--- a/syndicate-server/src/services/daemon.rs
+++ b/syndicate-server/src/services/daemon.rs
@@ -25,7 +25,7 @@ pub fn on_demand(t: &mut Activation, config_ds: Arc<Cap>, root_ds: Arc<Cap>) {
         Ok(during!(t, config_ds, language(), <run-service $spec: DaemonService>, |t| {
             Supervisor::start(
                 t,
-                syndicate::name!(parent: None, "daemon", service = ?spec),
+                syndicate::name!(parent: None, "daemon", id = ?spec.id),
                 SupervisorConfiguration::default(),
                 enclose!((config_ds, spec) lifecycle::updater(config_ds, spec)),
                 enclose!((config_ds, root_ds) move |t|
diff --git a/syndicate-server/src/services/milestone.rs b/syndicate-server/src/services/milestone.rs
index df77c8d..e249d0d 100644
--- a/syndicate-server/src/services/milestone.rs
+++ b/syndicate-server/src/services/milestone.rs
@@ -9,10 +9,12 @@ use crate::schemas::internal_services::Milestone;
 use syndicate_macros::during;
 
 pub fn on_demand(t: &mut Activation, ds: Arc<Cap>) {
-    t.spawn(syndicate::name!("on_demand", module = module_path!()), move |t| {
+    t.spawn(syndicate::name!("milestone"), move |t| {
         Ok(during!(t, ds, language(), <run-service $spec: Milestone>, |t: &mut Activation| {
+            tracing::info!(milestone = ?spec.name, "entered");
             ds.assert(t, language(), &lifecycle::started(&spec));
             ds.assert(t, language(), &lifecycle::ready(&spec));
+            t.on_stop(move |_| { tracing::info!(milestone = ?spec.name, "exited"); Ok(()) });
             Ok(())
         }))
     });
diff --git a/syndicate-server/src/services/unix_relay_listener.rs b/syndicate-server/src/services/unix_relay_listener.rs
index 66cd59c..9de0d05 100644
--- a/syndicate-server/src/services/unix_relay_listener.rs
+++ b/syndicate-server/src/services/unix_relay_listener.rs
@@ -78,7 +78,7 @@ async fn bind_unix_listener(path: &PathBuf) -> Result<UnixListener, Error> {
                 Ok(_probe) => Err(e)?, // Someone's already there! Give up.
                 Err(f) if f.kind() == io::ErrorKind::ConnectionRefused => {
                     // Try to steal the socket.
-                    tracing::info!("Cleaning stale socket");
+                    tracing::debug!("Cleaning stale socket");
                     std::fs::remove_file(path)?;
                     Ok(UnixListener::bind(path)?)
                 }