Incorporate log crate

Author: jimmiebfulton

Cargo.toml

@@ -13,9 +13,13 @@ async-trait = "0.1.52"
 bollard = "= 0.11.0"
 bollard-stubs = "= 1.41.0"
 futures = "0.3"
+log = "0.4"
 thiserror = "1.0"
 tokio = {version = "1.17.0", features = ["rt","macros"]}
 
+[dev-dependencies]
+env_logger = "0.8"
+
 [[test]]
 name = "integration"
-path = "tests/lib.rs"
+path = "tests/integration/lib.rs"

src/container.rs

@@ -1,9 +1,11 @@
-use crate::bollard::container::{InspectContainerOptions, RemoveContainerOptions};
-use crate::bollard::Docker;
-use async_trait::async_trait;
 use std::collections::HashMap;
 use std::fmt::Debug;
 
+use async_trait::async_trait;
+use log::{error, info, warn};
+
+use crate::bollard::container::{InspectContainerOptions, RemoveContainerOptions};
+use crate::bollard::Docker;
 pub use crate::errors::TestcontainerError;
 use crate::{DropAction, ImageSettings, Qualifier, Task};
 
@@ -121,7 +123,7 @@ impl Drop for ContainerHandle {
                 "remove" => drop_action = DropAction::Remove,
                 "retain" => drop_action = DropAction::Retain,
                 "stop" => drop_action = DropAction::Stop,
-                value => eprintln!(
+                value => warn!(
                     "'{}' is not a valid value for {}",
                     value, TESTCONTAINERS_DROP_ACTION
                 ),
@@ -136,7 +138,7 @@ impl Drop for ContainerHandle {
                 std::thread::spawn(move || {
                     let rt = tokio::runtime::Runtime::new().unwrap();
                     rt.block_on(async {
-                        eprintln!("Removing container {id}");
+                        info!("Removing container {}", &id[..12]);
                         let result = docker
                             .remove_container(
                                 id.as_str(),
@@ -150,7 +152,7 @@ impl Drop for ContainerHandle {
                         match result {
                             Ok(_) => {}
                             Err(error) => {
-                                eprintln!("Error removing container by id '{id}': {error}");
+                                error!("Error removing container by id '{}': {error}", &id[..12]);
                             }
                         }
 
@@ -159,21 +161,21 @@ impl Drop for ContainerHandle {
                 });
                 let _ = receiver.recv();
             }
-            DropAction::Retain => println!("Retaining container {}", self.id),
+            DropAction::Retain => info!("Retaining container {}", &self.id[..12]),
             DropAction::Stop => {
                 let id = self.id.clone();
                 let docker = self.docker.clone();
                 let (sender, receiver) = std::sync::mpsc::channel();
                 std::thread::spawn(move || {
                     let rt = tokio::runtime::Runtime::new().unwrap();
                     rt.block_on(async {
-                        eprintln!("Stopping container {id}");
+                        info!("Stopping container {id}");
                         let result = docker.stop_container(id.as_str(), None).await;
 
                         match result {
                             Ok(_) => {}
                             Err(error) => {
-                                eprintln!("Error stopping container by id '{id}': {error}");
+                                error!("Error stopping container by id '{}': {error}", &id[..12]);
                             }
                         }
 

src/image.rs

@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::fmt::{Display, Formatter};
 
 use futures::TryStreamExt;
+use log::{debug, info};
 
 use crate::bollard::container::Config;
 use crate::bollard::image::CreateImageOptions;
@@ -256,7 +257,7 @@ pub trait Image: Sized {
         match inspect_result {
             Ok(_) => (),
             Err(_) => {
-                eprintln!("Pulling image {}", self.settings().fullname());
+                info!("Pulling image {}", self.settings().fullname());
                 docker
                     .create_image(
                         Some(CreateImageOptions {
@@ -307,6 +308,8 @@ pub trait Image: Sized {
             ..Default::default()
         };
 
+        debug!("Creating container for {}", self.settings().fullname());
+
         let id = docker
             .create_container::<&str, String>(None, image_config)
             .await?
@@ -315,11 +318,23 @@ pub trait Image: Sized {
     }
 
     async fn on_start_container(&self, handle: &ContainerHandle) -> Result<(), TestcontainerError> {
+        debug!(
+            "Starting {} ({})",
+            &handle.id()[..12],
+            self.settings().fullname()
+        );
+
         handle
             .docker()
             .start_container::<String>(handle.id(), None)
             .await?;
 
+        info!(
+            "Started {} ({})",
+            &handle.id()[..12],
+            self.settings().fullname()
+        );
+
         Ok(())
     }
 

src/task.rs

@@ -1,7 +1,8 @@
 use crate::{async_trait, ContainerHandle, TestcontainerError};
+use std::fmt::Debug;
 
 #[async_trait]
-pub trait Task: 'static + Send + Sync {
+pub trait Task: 'static + Send + Sync + Debug {
     type Return;
 
     async fn execute(&self, handle: &ContainerHandle) -> Result<Self::Return, TestcontainerError>;

tests/example_impl.rs renamed to tests/integration/example_impl.rs

@@ -12,8 +12,13 @@ use testcontainers_async::{
     AdminContainer, Container, DatabaseContainer, Image, ServiceContainer, TestcontainerError,
 };
 
+fn init() {
+    let _ = env_logger::builder().try_init();
+}
+
 #[tokio::test]
 async fn test_generic() -> Result<(), TestcontainerError> {
+    init();
     let redis = GenericImage::new("redis", "latest")
         .with_task(MatchLogOutput::containing("Ready to accept connections"))
         .start_container()
@@ -27,6 +32,7 @@ async fn test_generic() -> Result<(), TestcontainerError> {
 
 #[tokio::test]
 async fn test_redis() -> Result<(), TestcontainerError> {
+    init();
     let redis = RedisImage::default().start_container().await?;
 
     let port = redis.service_port().await?;
@@ -37,6 +43,7 @@ async fn test_redis() -> Result<(), TestcontainerError> {
 
 #[tokio::test]
 async fn test_postgres() -> Result<(), TestcontainerError> {
+    init();
     let postgres = PostgresImage::default()
         .with_database("example-service")
         .with_username("test")
@@ -56,6 +63,7 @@ async fn test_postgres() -> Result<(), TestcontainerError> {
 
 #[tokio::test]
 async fn test_cockroach() -> Result<(), TestcontainerError> {
+    init();
     let crdb = CockroachDbImage::default().start_container().await?;
 
     let service_port = crdb.service_port().await?;
@@ -69,6 +77,7 @@ async fn test_cockroach() -> Result<(), TestcontainerError> {
 
 #[tokio::test]
 async fn test_mysql() -> Result<(), TestcontainerError> {
+    init();
     let mysql = MySqlImage::default()
         .with_database("example-service")
         .with_username("test")
@@ -83,6 +92,7 @@ async fn test_mysql() -> Result<(), TestcontainerError> {
 
 #[tokio::test]
 async fn test_example_impl() -> Result<(), TestcontainerError> {
+    init();
     let example = ExampleImage::default().start_container().await?;
 
     let port = example.primary_port().await.expect("Port expected");