summaryrefslogtreecommitdiffstats
path: root/server/src/main.rs
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-04-14 15:45:49 -0400
committerDessalines <tyhou13@gmx.com>2020-04-14 15:45:49 -0400
commit641e4c5d96d9d152bc75318b3ea08f789d920b2b (patch)
tree98c6c1c7f218915985d156f7302979769218ca1f /server/src/main.rs
parent16005a0c0546583d876f614b9f1705d1c2462b9b (diff)
parent6d5518cbd4499a9266915d4e7acb0c26aef8c125 (diff)
Merge branch 'admin_settings' into dev
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 601c2e0d..f3887527 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -39,6 +39,7 @@ async fn main() -> io::Result<()> {
// Create Http server with websocket support
HttpServer::new(move || {
+ let settings = Settings::get();
App::new()
.wrap(middleware::Logger::default())
.data(pool.clone())
@@ -58,7 +59,7 @@ async fn main() -> io::Result<()> {
))
.service(actix_files::Files::new(
"/docs",
- settings.front_end_dir.to_owned() + "/documentation",
+ settings.front_end_dir + "/documentation",
))
})
.bind((settings.bind, settings.port))?