Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
148
Issues
148
List
Board
Labels
Milestones
Merge Requests
10
Merge Requests
10
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
c3a90536
Commit
c3a90536
authored
Mar 12, 2018
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SERVER] Adding logs for dev.
parent
e949412d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
API.hs
src/Gargantext/API.hs
+7
-3
No files found.
src/Gargantext/API.hs
View file @
c3a90536
...
@@ -82,7 +82,7 @@ import Network.Wai (Request, requestHeaders)
...
@@ -82,7 +82,7 @@ import Network.Wai (Request, requestHeaders)
--import qualified Network.Wai.Handler.Warp as Warp
--import qualified Network.Wai.Handler.Warp as Warp
import
Network.Wai.Middleware.Cors
import
Network.Wai.Middleware.Cors
--
import Network.Wai.Middleware.RequestLogger
import
Network.Wai.Middleware.RequestLogger
-- import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
-- import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
import
Network.HTTP.Types
hiding
(
Query
)
import
Network.HTTP.Types
hiding
(
Query
)
...
@@ -100,7 +100,10 @@ fireWall req fw = do
...
@@ -100,7 +100,10 @@ fireWall req fw = do
let
hostOk
=
Just
(
encodeUtf8
"localhost:3000"
)
let
hostOk
=
Just
(
encodeUtf8
"localhost:3000"
)
let
originOk
=
Just
(
encodeUtf8
"http://localhost:8008"
)
let
originOk
=
Just
(
encodeUtf8
"http://localhost:8008"
)
if
origin
==
originOk
&&
host
==
hostOk
||
(
not
$
unFireWall
fw
)
if
origin
==
originOk
&&
host
==
hostOk
||
(
not
$
unFireWall
fw
)
then
pure
True
then
pure
True
else
pure
False
else
pure
False
...
@@ -111,6 +114,7 @@ makeApp fw = do
...
@@ -111,6 +114,7 @@ makeApp fw = do
let
serverApp
=
appMock
let
serverApp
=
appMock
-- logWare <- mkRequestLogger def { destination = RequestLogger.Logger $ env^.logger }
-- logWare <- mkRequestLogger def { destination = RequestLogger.Logger $ env^.logger }
--logWare <- mkRequestLogger def { destination = RequestLogger.Logger "/tmp/logs.txt" }
let
checkOriginAndHost
app
req
resp
=
do
let
checkOriginAndHost
app
req
resp
=
do
blocking
<-
fireWall
req
fw
blocking
<-
fireWall
req
fw
case
blocking
of
case
blocking
of
...
@@ -135,7 +139,7 @@ makeApp fw = do
...
@@ -135,7 +139,7 @@ makeApp fw = do
-- $ Warp.defaultSettings
-- $ Warp.defaultSettings
--pure (warpS, logWare $ checkOriginAndHost $ corsMiddleware $ serverApp)
--pure (warpS, logWare $ checkOriginAndHost $ corsMiddleware $ serverApp)
pure
$
checkOriginAndHost
$
corsMiddleware
$
serverApp
pure
$
logStdoutDev
$
checkOriginAndHost
$
corsMiddleware
$
serverApp
---------------------------------------------------------------------
---------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment