fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(avs): incomplete config throws error

Browse Source
This commit is contained in:
Steffen Jost 2022-09-02 11:38:03 +02:00
parent 7c86293005
commit 1d3c278682
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db.sh
View File

@ -13,4 +13,5 @@ fi
stack build --fast --flag uniworx:-library-only --flag uniworx:dev stack build --fast --flag uniworx:-library-only --flag uniworx:dev
export SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} export SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true}
export AVSPASS=${AVSPASS:-nopasswordset}
stack exec uniworxdb -- $@ stack exec uniworxdb -- $@

7
src/Application.hs
View File

@ -348,9 +348,10 @@ makeFoundation appSettings''@AppSettings{..} = do
appAvsQuery <- case appAvsConf of appAvsQuery <- case appAvsConf of
Nothing -> do Nothing -> do
$logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings." -- $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings."
return Nothing -- return Nothing
-- liftIO exitFailure error "AvsConfig is empty, i.e. invalid AVS configuration settings."
Just avsConf -> do Just avsConf -> do
-- TODO: consider using Servant.Client.Core.BaseUrl.Instances.parseBaseUrl' within Settings already at Startup! -- TODO: consider using Servant.Client.Core.BaseUrl.Instances.parseBaseUrl' within Settings already at Startup!
manager <- newManagerSettings $ mkManagerSettings (def { settingDisableCertificateValidation = True }) Nothing manager <- newManagerSettings $ mkManagerSettings (def { settingDisableCertificateValidation = True }) Nothing

1
start.sh
View File

@ -22,6 +22,7 @@ export ALLOW_DEPRECATED=${ALLOW_DEPRECATED:-true}
export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false} export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false}
export RIBBON=${RIBBON:-${__HOST:-localhost}} export RIBBON=${RIBBON:-${__HOST:-localhost}}
export APPROOT=${APPROOT:-http://localhost:$((${PORT_OFFSET:-0} + 3000))} export APPROOT=${APPROOT:-http://localhost:$((${PORT_OFFSET:-0} + 3000))}
export AVSPASS=${AVSPASS:-nopasswordset}
unset HOST unset HOST
move-back() { move-back() {