This repository was archived by the owner on Sep 8, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +78
-4
lines changed Expand file tree Collapse file tree 4 files changed +78
-4
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ edition = "2018"
7
7
[dependencies ]
8
8
rouille = " 3.0.0"
9
9
diesel = { version = " 1.3.3" , features = [" mysql" ] }
10
+ diesel_migrations = " 1.4.0"
10
11
dotenv = " 0.13.0"
11
12
serde = { version = " 1.0" , features = [" derive" ]}
12
13
serde_json = " 1.0"
Original file line number Diff line number Diff line change 1
1
#[ macro_use]
2
2
extern crate diesel;
3
3
4
+ #[ macro_use]
5
+ extern crate diesel_migrations;
6
+
4
7
5
8
pub mod errors;
6
9
pub mod users;
Original file line number Diff line number Diff line change
1
+ #[ macro_use]
2
+ extern crate diesel_migrations;
3
+
1
4
use std:: env;
2
5
use std:: sync:: Mutex ;
3
6
use std:: thread;
@@ -6,7 +9,6 @@ use std::time;
6
9
use log:: debug;
7
10
use log:: error;
8
11
use log:: info;
9
- use log:: trace;
10
12
use log:: warn;
11
13
12
14
use diesel:: prelude:: * ;
@@ -20,6 +22,8 @@ use web_dev::errors::WebdevErrorKind;
20
22
use web_dev:: users:: models:: UserRequest ;
21
23
use web_dev:: users:: requests:: handle_user;
22
24
25
+ embed_migrations ! ( ) ;
26
+
23
27
fn main ( ) {
24
28
dotenv ( ) . ok ( ) ;
25
29
@@ -30,7 +34,7 @@ fn main() {
30
34
31
35
let database_url = match env:: var ( "DATABASE_URL" ) {
32
36
Ok ( url) => url,
33
- Err ( e ) => {
37
+ Err ( _e ) => {
34
38
error ! ( "Could not read DATABASE_URL environment variable" ) ;
35
39
return ;
36
40
}
@@ -42,15 +46,18 @@ fn main() {
42
46
match MysqlConnection :: establish ( & database_url) {
43
47
Ok ( c) => break c,
44
48
Err ( e) => {
45
- error ! ( "Could not connect to database: {}" , e) ;
46
- error ! ( "Retrying in a second" ) ;
49
+ warn ! ( "Could not connect to database: {}" , e) ;
50
+ info ! ( "Retrying in a second" ) ;
47
51
thread:: sleep ( time:: Duration :: from_secs ( 1 ) ) ;
48
52
}
49
53
}
50
54
} ;
51
55
52
56
debug ! ( "Connected to database" ) ;
53
57
58
+ info ! ( "Running migrations" ) ;
59
+ embedded_migrations:: run ( & connection) ;
60
+
54
61
let connection_mutex = Mutex :: new ( connection) ;
55
62
56
63
info ! ( "Starting server on 0.0.0.0:8000" ) ;
You can’t perform that action at this time.
0 commit comments