Add debug output in release subcommand

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

3 files changed, 20 insertions, 9 deletions

diff --git a/src/commands/release.rs b/src/commands/release.rs
index 023a555..0c6665b 100644
--- a/src/commands/release.rs
+++ b/src/commands/release.rs
@@ -24,15 +24,19 @@ pub async fn release(db_connection_config: DbConnectionConfig, config: &Configur
         .value_of("package_version")
         .map(String::from);
 
+    debug!("Release called for: {:?} {:?}", pname, pvers);
+
     let conn = crate::db::establish_connection(db_connection_config)?;
     let submit_uuid = matches.value_of("submit_uuid")
         .map(uuid::Uuid::parse_str)
         .transpose()?
         .unwrap(); // safe by clap
+    debug!("Release called for submit: {:?}", submit_uuid);
 
     let submit = crate::schema::submits::dsl::submits
         .filter(crate::schema::submits::dsl::uuid.eq(submit_uuid))
         .first::<dbmodels::Submit>(&conn)?;
+    debug!("Found Submit: {:?}", submit_uuid);
 
     let arts = {
         let sel = crate::schema::artifacts::dsl::artifacts
@@ -45,27 +49,33 @@ pub async fn release(db_connection_config: DbConnectionConfig, config: &Configur
 
         match (pname, pvers) {
             (Some(name), Some(vers)) => {
-                sel.filter(crate::schema::packages::name.eq(name))
-                    .filter(crate::schema::packages::version.like(vers))
-                    .load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
+                let query = sel.filter(crate::schema::packages::name.eq(name))
+                    .filter(crate::schema::packages::version.like(vers));
+                debug!("Query: {}", diesel::debug_query(&query).to_string());
+                query.load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
             },
             (Some(name), None) => {
-                sel.filter(crate::schema::packages::name.eq(name))
-                    .load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
+                let query = sel.filter(crate::schema::packages::name.eq(name));
+                debug!("Query: {}", diesel::debug_query(&query).to_string());
+                query.load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
             },
             (None, Some(vers)) => {
-                sel.filter(crate::schema::packages::version.like(vers))
-                    .load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
+                let query = sel.filter(crate::schema::packages::version.like(vers));
+                debug!("Query: {}", diesel::debug_query(&query).to_string());
+                query.load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
             },
             (None, None) => {
+                debug!("Query: {}", diesel::debug_query(&sel).to_string());
                 sel.load::<(dbmodels::Artifact, (dbmodels::Job, dbmodels::Package))>(&conn)?
             },
         }
     };
+    debug!("Artifacts = {:?}", arts);
 
     arts.iter()
         .filter_map(|(art, _)| art.path_buf().parent().map(|p| config.releases_directory().join(p)))
         .map(|p| async {
+            debug!("mkdir {:?}", p);
             tokio::fs::create_dir_all(p).await.map_err(Error::from)
         })
         .collect::<futures::stream::FuturesUnordered<_>>()
@@ -98,6 +108,7 @@ pub async fn release(db_connection_config: DbConnectionConfig, config: &Configur
         .await?
         .into_iter()
         .map(|art| {
+            debug!("Updating {:?} to set released = true", art);
             diesel::update(&art)
                 .set(crate::schema::artifacts::released.eq(true))
                 .execute(&conn)
diff --git a/src/db/models/job.rs b/src/db/models/job.rs
index 4d80637..d1cbd3a 100644
--- a/src/db/models/job.rs
+++ b/src/db/models/job.rs
@@ -10,7 +10,7 @@ use crate::schema::jobs::*;
 use crate::schema::jobs;
 use crate::util::docker::ContainerHash;
 
-#[derive(Identifiable, Queryable, Associations)]
+#[derive(Debug, Identifiable, Queryable, Associations)]
 #[belongs_to(Submit)]
 #[belongs_to(Endpoint)]
 #[belongs_to(Package)]
diff --git a/src/db/models/package.rs b/src/db/models/package.rs
index b0b99ee..328efcc 100644
--- a/src/db/models/package.rs
+++ b/src/db/models/package.rs
@@ -8,7 +8,7 @@ use diesel::prelude::*;
 use crate::schema::packages::*;
 use crate::schema::packages;
 
-#[derive(Identifiable, Queryable)]
+#[derive(Debug, Identifiable, Queryable)]
 pub struct Package {
     pub id: i32,
     pub name: String,