diff options
Diffstat (limited to 'license-generator/src')
| -rw-r--r-- | license-generator/src/database.rs | 5 | ||||
| -rw-r--r-- | license-generator/src/main.rs | 22 |
2 files changed, 21 insertions, 6 deletions
diff --git a/license-generator/src/database.rs b/license-generator/src/database.rs index 505a788..a0331c2 100644 --- a/license-generator/src/database.rs +++ b/license-generator/src/database.rs @@ -4,11 +4,10 @@ use mysql; use errors::*; -pub fn get_database_connection() -> Result<mysql::PooledConn> { +pub fn get_database_pool() -> Result<mysql::Pool> { let connection_url = env::var("DATABASE_URL") .chain_err(|| "DATABASE_URL environment variable not found")?; let pool = mysql::Pool::new_manual(10, 50, connection_url)?; - let cx = pool.get_conn()?; - Ok(cx) + Ok(pool) } diff --git a/license-generator/src/main.rs b/license-generator/src/main.rs index d18b880..fb29824 100644 --- a/license-generator/src/main.rs +++ b/license-generator/src/main.rs @@ -54,10 +54,10 @@ fn main() -> Result<()> { log_config.time_format = Some("%+"); WriteLogger::init(LevelFilter::Info, log_config, log_file)?; - let mut cx = match database::get_database_connection() - .chain_err(|| "failed to create a database connection") + let pool = match database::get_database_pool() + .chain_err(|| "failed to create a database connection pool") { - Ok(cx) => cx, + Ok(pool) => pool, Err(e) => { error!("{}", e); return Err(e); @@ -119,6 +119,22 @@ fn main() -> Result<()> { if name.is_some() && email.is_some() { let purchaser = Purchaser::new(name.unwrap(), email.unwrap()); + + let mut cx = match pool.get_conn() { + Ok(cx) => cx, + Err(e) => { + error!("{}", e); + + response::set_500(&mut req.stdout()).unwrap_or(()); + write!(&mut req.stdout(), "Content-Type: text/plain + +500 Internal Server Error") + .unwrap_or(()); + + return; + }, + }; + match purchaser.insert(&mut cx) { Ok(_) => { // TODO: Print message to be appended to user email |