diff --git a/Cargo.lock b/Cargo.lock index 9368840..3771f03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "amp-apiserver" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "amp-resources", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "amp-builder" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "amp-resources", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "amp-controllers" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "amp-resources", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "amp-crdgen" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "clap", @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "amp-resolver" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "amp-resources", @@ -177,7 +177,7 @@ dependencies = [ [[package]] name = "amp-resources" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "anyhow", @@ -197,7 +197,7 @@ dependencies = [ [[package]] name = "amp-syncer" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-common", "async-nats", @@ -213,7 +213,7 @@ dependencies = [ [[package]] name = "amp-workflow" -version = "0.8.18" +version = "0.8.19" dependencies = [ "amp-builder", "amp-common", diff --git a/Cargo.toml b/Cargo.toml index e016915..09f43b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.8.18" +version = "0.8.19" edition = "2021" license = "Apache-2.0" repository = "https://github.com/amphitheatre-app/amphitheatre" diff --git a/syncer/src/handle.rs b/syncer/src/handle.rs index d572150..712fc1c 100644 --- a/syncer/src/handle.rs +++ b/syncer/src/handle.rs @@ -15,11 +15,10 @@ use std::path::Path; use amp_common::sync::{self, Synchronization}; +use std::io::Result; use tar::Archive; use tracing::{debug, error, info, warn}; -type Result = std::result::Result>; - /// Overwrite workspace's files with payload tarball. pub fn overwrite(workspace: &Path, req: &Synchronization) -> Result<()> { debug!("Received overwrite event, workspace: {:?}, req: {:?}", workspace, req); diff --git a/syncer/src/main.rs b/syncer/src/main.rs index 5313160..ac4d755 100644 --- a/syncer/src/main.rs +++ b/syncer/src/main.rs @@ -35,7 +35,7 @@ async fn main() -> Result<(), async_nats::Error> { // Enable tracing. tracing_subscriber::registry() .with(EnvFilter::builder().with_default_directive(LevelFilter::INFO.into()).from_env_lossy()) - .with(tracing_subscriber::fmt::layer()) + .with(tracing_subscriber::fmt::layer().without_time().with_file(false).with_target(false)) .init(); // This returns an error if the `.env` file doesn't exist, but that's not what we want @@ -81,7 +81,7 @@ async fn main() -> Result<(), async_nats::Error> { // We don't want to crash the application because of a single message. // We can always retry later, but the next time retry, // the original intent may no longer be valid!!! - error!("Failed to handle message: {:?}", err); + error!("Failed to handle message: {}", err); continue; } // Acknowledge the message if we handled it successfully.