diff --git a/justfile b/justfile index ee5704c..daf3559 100644 --- a/justfile +++ b/justfile @@ -10,3 +10,5 @@ lint: build: cargo build --release +build-linux-musl-server: + cargo build --release --target=x86_64-unknown-linux-musl --no-default-features diff --git a/src/db.rs b/src/db.rs index 22ad20f..04d3c75 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,5 +1,5 @@ -use rusqlite::{Connection, params}; -use rust_util::{debugging, information, opt_result, simple_error, success, XResult}; +use rusqlite::{params, Connection}; +use rust_util::{opt_result, simple_error, XResult}; pub const DEFAULT_MASTER_KEY_VERIFICATION_KEY: &str = "__master_verification_key"; @@ -15,7 +15,7 @@ pub fn make_db_key_name(name: &str) -> String { pub fn open_db(db: &str) -> XResult { let con = opt_result!(Connection::open(db), "Open sqlite db: {}, failed: {}", db); - debugging!("Db auto commit: {}", con.is_autocommit()); + log::debug!("Db auto commit: {}", con.is_autocommit()); Ok(con) } @@ -24,7 +24,7 @@ pub fn init_db(conn: &Connection) -> XResult { "SELECT name FROM sqlite_master WHERE type='table' AND name='keys'")?; let mut rows = stmt.query(())?; if rows.next()?.is_some() { - information!("Table keys exists, skip init"); + log::info!("Table keys exists, skip init"); return Ok(false); } @@ -36,7 +36,7 @@ pub fn init_db(conn: &Connection) -> XResult { comment TEXT ) "##, ())?; - success!("Table keys created"); + log::info!("Table keys created"); Ok(true) }