From 950cb7ef6dbd61d4bb3618a088a1b722812251d9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 8 Dec 2017 10:02:32 +0200 Subject: [PATCH] Better development setting propagation --- Settings.hs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Settings.hs b/Settings.hs index 0b67e6a..e2d8244 100644 --- a/Settings.hs +++ b/Settings.hs @@ -68,13 +68,15 @@ instance FromJSON AppSettings where appIpFromHeader <- o .: "ip-from-header" appPostgresString <- o .: "postgres-string" - appDetailedRequestLogging <- o .:? "detailed-logging" .!= defaultDev - appShouldLogAll <- o .:? "should-log-all" .!= defaultDev - appReloadTemplates <- o .:? "reload-templates" .!= defaultDev - appMutableStatic <- o .:? "mutable-static" .!= defaultDev - appSkipCombining <- o .:? "skip-combining" .!= defaultDev - appForceSsl <- o .:? "force-ssl" .!= not defaultDev - appDevDownload <- o .:? "dev-download" .!= defaultDev + dev <- o .: "development" .!= defaultDev + + appDetailedRequestLogging <- o .:? "detailed-logging" .!= dev + appShouldLogAll <- o .:? "should-log-all" .!= dev + appReloadTemplates <- o .:? "reload-templates" .!= dev + appMutableStatic <- o .:? "mutable-static" .!= dev + appSkipCombining <- o .:? "skip-combining" .!= dev + appForceSsl <- o .:? "force-ssl" .!= not dev + appDevDownload <- o .:? "dev-download" .!= dev return AppSettings {..}