Some bugs

.gitignore

@@ -1,2 +1,3 @@
 target
 .DS_Store
+*.tar.*

rwf-cli/src/deploy.rs

@@ -41,7 +41,7 @@ pub async fn package(config: Option<PathBuf>) -> Result<(), Box<dyn std::error::
     tar.append_file(&info.name, &mut File::open(executable).expect("binary"))
         .expect("binary");
 
-    for path in ["static", "templates"] {
+    for path in ["static", "templates", "migrations"] {
         let p = Path::new(path);
 
         if p.is_dir() {

rwf-cli/src/main.rs

@@ -32,8 +32,11 @@ enum Subcommands {
     /// Remove a controller/view/model/all of the above
     Remove(RemoveSubcommand),
 
-    /// Build and deploy the application.
-    Deploy(DeploySubcommand),
+    /// Package the application into a tarball.
+    Package {
+        #[arg(long, short)]
+        config: Option<PathBuf>,
+    },
 }
 
 #[derive(Args, Debug)]
@@ -111,21 +114,6 @@ enum Remove {
     },
 }
 
-#[derive(Args, Debug)]
-struct DeploySubcommand {
-    #[command(subcommand)]
-    command: Deploy,
-}
-
-#[derive(Subcommand, Debug)]
-enum Deploy {
-    /// Package the application for deployment.
-    Package {
-        #[arg(long, short, help = "Rwf production configuration file")]
-        config: Option<PathBuf>,
-    },
-}
-
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
     // std::env::set_var("RWF_LOG_QUERIES", "1");
@@ -174,11 +162,7 @@ async fn main() {
             }
         },
 
-        Subcommands::Deploy(deploy) => match deploy.command {
-            Deploy::Package { config } => {
-                deploy::package(config).await.unwrap();
-            }
-        },
+        Subcommands::Package { config } => deploy::package(config).await.unwrap(),
     }
 }
 

rwf/src/config.rs

@@ -5,6 +5,7 @@ use std::env::var;
 use std::io::IsTerminal;
 use std::path::{Path, PathBuf};
 use time::Duration;
+use tracing::info;
 
 use crate::controller::middleware::csrf::Csrf;
 use crate::controller::middleware::{request_tracker::RequestTracker, Middleware};
@@ -64,6 +65,7 @@ impl Default for ConfigFile {
             websocket: WebsocketConfig::default(),
         }
         .transform()
+        .unwrap()
     }
 }
 
@@ -84,19 +86,12 @@ impl ConfigFile {
         let mut config: Self = toml::from_str(&file)?;
         config.path = Some(path.as_ref().to_owned());
 
-        let mut config = config.transform();
-
-        let secret_key = config.general.secret_key()?;
-
-        config.general.aes_key =
-            Key::<AesGcmSiv<Aes128>>::clone_from_slice(&secret_key[0..128 / 8]);
-        config.general.secure_id_key =
-            Key::<AesGcmSiv<Aes128>>::clone_from_slice(&secret_key[128 / 8..]);
+        let config = config.transform()?;
 
         Ok(config)
     }
 
-    fn transform(mut self) -> Self {
+    fn transform(mut self) -> Result<Self, Error> {
         let mut default_middleware = vec![];
 
         // Request tracker always first. We want it to always run.
@@ -109,7 +104,22 @@ impl ConfigFile {
         }
 
         self.general.default_middleware = MiddlewareSet::without_default(default_middleware);
-        self
+
+        let secret_key = self.general.secret_key()?;
+
+        self.general.aes_key = Key::<AesGcmSiv<Aes128>>::clone_from_slice(&secret_key[0..128 / 8]);
+        self.general.secure_id_key =
+            Key::<AesGcmSiv<Aes128>>::clone_from_slice(&secret_key[128 / 8..]);
+
+        Ok(self)
+    }
+
+    pub fn log_info(&self) {
+        if let Some(ref path) = self.path {
+            info!("Configuration file \"{}\" loaded", path.display());
+        } else {
+            info!("Configuration file missing, loaded from environment instead");
+        }
     }
 }
 

rwf/src/logging.rs

@@ -1,15 +1,23 @@
 use crate::config::get_config;
+use once_cell::sync::OnceCell;
 use tracing_subscriber::{filter::LevelFilter, fmt, util::SubscriberInitExt, EnvFilter};
 
+static INITIALIZED: OnceCell<()> = OnceCell::new();
+
 pub struct Logger;
 
 impl Logger {
     pub fn init() {
-        setup_logging()
+        INITIALIZED.get_or_init(|| {
+            setup_logging();
+            get_config().log_info();
+
+            ()
+        });
     }
 }
 
-pub fn setup_logging() {
+fn setup_logging() {
     fmt()
         .with_env_filter(
             EnvFilter::builder()

rwf/src/model/pool/connection.rs

@@ -44,14 +44,12 @@ impl Connection {
     pub async fn new(database_url: &str) -> Result<Self, Error> {
         let (client, connection) = tokio_postgres::connect(database_url, NoTls).await?;
 
-        info!("New connection to PostgreSQL created");
-
         let bad = AtomicBool::new(false);
         let shutdown = Notify::new();
 
         let inner = Arc::new(ConnectionInner { bad, shutdown });
 
-        let guard = Connection {
+        let mut guard = Connection {
             client,
             inner: inner.clone(),
             last_used: Instant::now(),
@@ -71,6 +69,19 @@ impl Connection {
             }
         });
 
+        let info = guard
+            .query_cached("SELECT current_database()::text, current_user::text", &[])
+            .await?;
+
+        let row = info.get(0).unwrap();
+        let user: String = row.get::<_, String>(1);
+        let database: String = row.get::<_, String>(0);
+
+        info!(
+            "New connection to database \"{}\" with user \"{}\" created",
+            database, user
+        );
+
         Ok(guard)
     }