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
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Christian Merten
haskell-gargantext
Commits
e66f7257
Verified
Commit
e66f7257
authored
Dec 08, 2023
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[refactor] replace printDebug with log
parent
a304d123
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
20 deletions
+40
-20
pkgs.nix
nix/pkgs.nix
+1
-0
CoreNLP.hs
src/Gargantext/Core/Text/Terms/Multi/CoreNLP.hs
+4
-2
Prelude.hs
src/Gargantext/Database/Prelude.hs
+4
-6
UpdateOpaleye.hs
src/Gargantext/Database/Query/Table/Node/UpdateOpaleye.hs
+8
-5
Logging.hs
src/Gargantext/System/Logging.hs
+23
-5
Setup.hs
test/Test/API/Setup.hs
+0
-2
No files found.
nix/pkgs.nix
View file @
e66f7257
...
@@ -102,6 +102,7 @@ rec {
...
@@ -102,6 +102,7 @@ rec {
hlint
hlint
libffi
libffi
lapack
lapack
lnav
lzma
lzma
pcre
pcre
pkgconfig
pkgconfig
...
...
src/Gargantext/Core/Text/Terms/Multi/CoreNLP.hs
View file @
e66f7257
...
@@ -35,6 +35,7 @@ import Data.Text (splitOn, pack, toLower)
...
@@ -35,6 +35,7 @@ import Data.Text (splitOn, pack, toLower)
import
Gargantext.Core
(
Lang
(
..
))
import
Gargantext.Core
(
Lang
(
..
))
import
Gargantext.Core.Types
import
Gargantext.Core.Types
import
Gargantext.Prelude
hiding
(
ByteString
,
toLower
)
import
Gargantext.Prelude
hiding
(
ByteString
,
toLower
)
import
Gargantext.System.Logging
qualified
as
Log
import
Network.HTTP.Simple
import
Network.HTTP.Simple
import
Network.URI
(
URI
(
..
))
import
Network.URI
(
URI
(
..
))
import
Text.CoreNLP.Types
qualified
as
CoreNLP
import
Text.CoreNLP.Types
qualified
as
CoreNLP
...
@@ -126,8 +127,9 @@ corenlp' uri lang txt = do
...
@@ -126,8 +127,9 @@ corenlp' uri lang txt = do
case
e
of
case
e
of
JSONParseException
_req
res
_err
->
do
JSONParseException
_req
res
_err
->
do
let
body
=
getResponseBody
res
let
body
=
getResponseBody
res
printDebug
"[corenlp'] request text"
(
cs
txt
::
ByteString
)
logger
<-
Log
.
getLogger
printDebug
"[corenlp'] response body (error)"
body
$
(
Log
.
logLoc
)
logger
Log
.
DEBUG
$
"[corenlp'] request text "
<>
(
decodeUtf8
$
BSL
.
toStrict
$
cs
txt
)
$
(
Log
.
logLoc
)
logger
Log
.
DEBUG
$
"[corenlp'] response body (error) "
<>
show
body
throwIO
e
throwIO
e
JSONConversionException
_req
_res
_err
->
throwIO
e
JSONConversionException
_req
_res
_err
->
throwIO
e
where
where
...
...
src/Gargantext/Database/Prelude.hs
View file @
e66f7257
...
@@ -58,17 +58,15 @@ instance HasConfig GargConfig where
...
@@ -58,17 +58,15 @@ instance HasConfig GargConfig where
type
JSONB
=
DefaultFromField
SqlJsonb
type
JSONB
=
DefaultFromField
SqlJsonb
-------------------------------------------------------
-------------------------------------------------------
type
CmdM'
'
env
err
m
=
type
CmdM'
env
err
m
=
(
MonadReader
env
m
(
MonadReader
env
m
,
MonadError
err
m
,
MonadError
err
m
,
MonadBaseControl
IO
m
,
MonadBaseControl
IO
m
,
MonadRandom
m
)
)
type
CmdM'
env
err
m
=
type
CmdM''
env
err
m
=
(
MonadReader
env
m
(
CmdM'
env
err
m
,
MonadError
err
m
,
MonadRandom
m
,
MonadBaseControl
IO
m
)
)
-- | If possible, try to not add more constraints here. When performing
-- | If possible, try to not add more constraints here. When performing
...
...
src/Gargantext/Database/Query/Table/Node/UpdateOpaleye.hs
View file @
e66f7257
...
@@ -10,6 +10,7 @@ Portability : POSIX
...
@@ -10,6 +10,7 @@ Portability : POSIX
-}
-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE TemplateHaskell #-}
module
Gargantext.Database.Query.Table.Node.UpdateOpaleye
module
Gargantext.Database.Query.Table.Node.UpdateOpaleye
...
@@ -24,14 +25,16 @@ import Gargantext.Database.Query.Table.Node
...
@@ -24,14 +25,16 @@ import Gargantext.Database.Query.Table.Node
import
Gargantext.Database.Query.Table.Node.Error
import
Gargantext.Database.Query.Table.Node.Error
import
Gargantext.Database.Schema.Node
import
Gargantext.Database.Schema.Node
import
Gargantext.Prelude
import
Gargantext.Prelude
import
Gargantext.System.Logging
qualified
as
Log
import
Opaleye
import
Opaleye
-- import Debug.Trace (trace)
updateHyperdata
::
HyperdataC
a
=>
NodeId
->
a
->
DBCmd
err
Int64
updateHyperdata
::
HyperdataC
a
=>
NodeId
->
a
->
DBCmd
err
Int64
updateHyperdata
i
h
=
mkCmd
$
\
c
->
putStrLn
(
"before runUpdate_"
::
Text
)
>>
updateHyperdata
i
h
=
mkCmd
$
\
c
->
do
runUpdate_
c
(
updateHyperdataQuery
i
h
)
>>=
\
res
->
logger
<-
liftIO
Log
.
getLogger
putStrLn
(
"after runUpdate_"
::
Text
)
>>
pure
res
liftIO
$
$
(
Log
.
logLoc
)
logger
Log
.
DEBUG
(
"before runUpdate_"
::
Text
)
res
<-
runUpdate_
c
(
updateHyperdataQuery
i
h
)
liftIO
$
$
(
Log
.
logLoc
)
logger
Log
.
DEBUG
(
"after runUpdate_"
::
Text
)
pure
res
updateHyperdataQuery
::
HyperdataC
a
=>
NodeId
->
a
->
Update
Int64
updateHyperdataQuery
::
HyperdataC
a
=>
NodeId
->
a
->
Update
Int64
updateHyperdataQuery
i
h
=
seq
h'
$
{- trace "updateHyperdataQuery: encoded JSON" $ -}
Update
updateHyperdataQuery
i
h
=
seq
h'
$
{- trace "updateHyperdataQuery: encoded JSON" $ -}
Update
...
...
src/Gargantext/System/Logging.hs
View file @
e66f7257
{-|
Module : Gargantext.System.Logging
Description : Error logging etc
Copyright : (c) CNRS, 2017-Present
License : AGPL + CECILL v3
Maintainer : team@gargantext.org
Stability : experimental
Portability : POSIX
TODO-SECURITY: Critical
-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeApplications #-}
...
@@ -13,14 +26,16 @@ module Gargantext.System.Logging (
...
@@ -13,14 +26,16 @@ module Gargantext.System.Logging (
,
withLoggerHoisted
,
withLoggerHoisted
)
where
)
where
import
Language.Haskell.TH
hiding
(
Type
)
import
Control.Exception.Lifted
(
bracket
)
import
Control.Exception.Lifted
(
bracket
)
import
Control.Monad.IO.Class
import
Control.Monad.IO.Class
import
Control.Monad.Trans.Control
import
Control.Monad.Trans.Control
import
Data.Kind
(
Type
)
import
Data.Kind
(
Type
)
import
Data.Text
qualified
as
T
import
Language.Haskell.TH
hiding
(
Type
)
import
Language.Haskell.TH.Syntax
qualified
as
TH
import
Prelude
import
Prelude
import
qualified
Data.Text
as
T
import
qualified
Language.Haskell.TH.Syntax
as
TH
data
LogLevel
=
data
LogLevel
=
-- | Debug messages
-- | Debug messages
...
@@ -55,7 +70,7 @@ class HasLogger m where
...
@@ -55,7 +70,7 @@ class HasLogger m where
logTxt
::
Logger
m
->
LogLevel
->
T
.
Text
->
m
()
logTxt
::
Logger
m
->
LogLevel
->
T
.
Text
->
m
()
-- | Separate typeclass to get hold of a 'Logger' from within a monad.
-- | Separate typeclass to get hold of a 'Logger' from within a monad.
-- We ke
e
y 'HasLogger' and 'MonadLogger' separate to enforce compositionality,
-- We key 'HasLogger' and 'MonadLogger' separate to enforce compositionality,
-- i.e. we can still give instances to 'HasLogger' for things like 'IO' without
-- i.e. we can still give instances to 'HasLogger' for things like 'IO' without
-- having to force actually acquiring a logger for those monads.
-- having to force actually acquiring a logger for those monads.
class
HasLogger
m
=>
MonadLogger
m
where
class
HasLogger
m
=>
MonadLogger
m
where
...
@@ -126,7 +141,10 @@ instance HasLogger IO where
...
@@ -126,7 +141,10 @@ instance HasLogger IO where
type
instance
LogPayload
IO
=
String
type
instance
LogPayload
IO
=
String
initLogger
=
\
()
->
pure
IOLogger
initLogger
=
\
()
->
pure
IOLogger
destroyLogger
=
\
_
->
pure
()
destroyLogger
=
\
_
->
pure
()
logMsg
=
\
IOLogger
lvl
msg
->
logMsg
IOLogger
lvl
msg
=
let
pfx
=
"["
<>
show
lvl
<>
"] "
let
pfx
=
"["
<>
show
lvl
<>
"] "
in
putStrLn
$
pfx
<>
msg
in
putStrLn
$
pfx
<>
msg
logTxt
lgr
lvl
msg
=
logMsg
lgr
lvl
(
T
.
unpack
msg
)
logTxt
lgr
lvl
msg
=
logMsg
lgr
lvl
(
T
.
unpack
msg
)
instance
MonadLogger
IO
where
getLogger
=
pure
IOLogger
test/Test/API/Setup.hs
View file @
e66f7257
...
@@ -23,7 +23,6 @@ import Gargantext.Database.Admin.Trigger.Init
...
@@ -23,7 +23,6 @@ import Gargantext.Database.Admin.Trigger.Init
import
Gargantext.Database.Admin.Types.Hyperdata
import
Gargantext.Database.Admin.Types.Hyperdata
import
Gargantext.Database.Prelude
import
Gargantext.Database.Prelude
import
Gargantext.Database.Query.Table.Node
(
getOrMkList
)
import
Gargantext.Database.Query.Table.Node
(
getOrMkList
)
-- import Gargantext.Prelude (printDebug)
import
Gargantext.Prelude.Config
import
Gargantext.Prelude.Config
import
Gargantext.System.Logging
import
Gargantext.System.Logging
import
Network.HTTP.Client.TLS
(
newTlsManager
)
import
Network.HTTP.Client.TLS
(
newTlsManager
)
...
@@ -104,7 +103,6 @@ setupEnvironment env = flip runReaderT env $ runTestMonad $ do
...
@@ -104,7 +103,6 @@ setupEnvironment env = flip runReaderT env $ runTestMonad $ do
(
Left
corpusMasterName
)
(
Left
corpusMasterName
)
(
Nothing
::
Maybe
HyperdataCorpus
)
(
Nothing
::
Maybe
HyperdataCorpus
)
masterListId
<-
getOrMkList
masterCorpusId
masterUserId
masterListId
<-
getOrMkList
masterCorpusId
masterUserId
-- printDebug "[setupEnvironment] masterListId: " masterListId
void
$
initLastTriggers
masterListId
void
$
initLastTriggers
masterListId
-- | Creates two users, Alice & Bob. Alice shouldn't be able to see
-- | Creates two users, Alice & Bob. Alice shouldn't be able to see
...
...
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