;dev: web: refactor
This commit is contained in:
parent
957b217386
commit
c0a4983e87
@ -152,17 +152,18 @@ rawOptsToWebOpts :: RawOpts -> IO WebOpts
|
|||||||
rawOptsToWebOpts rawopts =
|
rawOptsToWebOpts rawopts =
|
||||||
checkWebOpts <$> do
|
checkWebOpts <$> do
|
||||||
cliopts <- rawOptsToCliOpts rawopts
|
cliopts <- rawOptsToCliOpts rawopts
|
||||||
let h = fromMaybe defhost $ maybestringopt "host" rawopts
|
let
|
||||||
p = fromMaybe defport $ maybeposintopt "port" rawopts
|
h = fromMaybe defhost $ maybestringopt "host" rawopts
|
||||||
b = maybe (defbaseurl h p) stripTrailingSlash $ maybestringopt "base-url" rawopts
|
p = fromMaybe defport $ maybeposintopt "port" rawopts
|
||||||
sock = stripTrailingSlash <$> maybestringopt "socket" rawopts
|
b = maybe (defbaseurl h p) stripTrailingSlash $ maybestringopt "base-url" rawopts
|
||||||
access =
|
sock = stripTrailingSlash <$> maybestringopt "socket" rawopts
|
||||||
case lastMay $ listofstringopt "allow" rawopts of
|
access =
|
||||||
Nothing -> AddAccess
|
case lastMay $ listofstringopt "allow" rawopts of
|
||||||
Just t ->
|
Nothing -> AddAccess
|
||||||
case parseAccessLevel t of
|
Just t ->
|
||||||
Right al -> al
|
case parseAccessLevel t of
|
||||||
Left err -> error' ("Unknown access level: " ++ err) -- PARTIAL:
|
Right al -> al
|
||||||
|
Left err -> error' ("Unknown access level: " ++ err) -- PARTIAL:
|
||||||
return
|
return
|
||||||
defwebopts
|
defwebopts
|
||||||
{ serve_ = case sock of
|
{ serve_ = case sock of
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user