[API] metrics: fix logging

src/Gargantext/API/Metrics.hs

@@ -11,7 +11,8 @@ Metrics API
 
 -}
 
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TypeOperators   #-}
 
 module Gargantext.API.Metrics
     where
@@ -42,6 +43,7 @@ import Gargantext.Database.Query.Table.Node.Error (HasNodeError)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Schema.Node (node_hyperdata)
 import Gargantext.Prelude hiding (hash)
+import Gargantext.System.Logging (logLocM, LogLevel(DEBUG), MonadLogger)
 import Servant.Server.Generic (AsServerT)
 
 
@@ -122,16 +124,16 @@ getChart :: HasNodeStory env err m
 getChart cId maybeListId tabType = do
   metricsGetter cId maybeListId tabType hl_chart updateChart'
   
-updateChart :: HasNodeError err
+updateChart :: (HasNodeStory env err m, MonadLogger m)
             => CorpusId
             -> Maybe ListId
             -> TabType
-            -> DBCmd err ()
+            -> m ()
 updateChart cId mListId tabType = do
   listId <- getListOrDefault cId mListId
-  printDebug "[updateChart] cId" cId
-  printDebug "[updateChart] listId" listId
-  printDebug "[updateChart] tabType" tabType
+  $(logLocM) DEBUG $ "[updateChart] cId: " <> show cId
+  $(logLocM) DEBUG $ "[updateChart] listId: " <> show listId
+  $(logLocM) DEBUG $ "[updateChart] tabType: " <> show tabType
   _ <- updateChart' cId listId tabType
   pure ()
 
@@ -145,7 +147,7 @@ updateChart' cId listId tabType = do
   updateNodeMetrics listId tabType hl_chart (ChartMetrics metrics)
 
 
-getChartHash :: HasNodeStory env err m
+getChartHash :: (HasNodeStory env err m, MonadLogger m)
              => CorpusId
              -> Maybe ListId
              -> TabType
@@ -170,16 +172,16 @@ getPie :: HasNodeStory env err m
 getPie cId maybeListId tabType = do
   metricsGetter cId maybeListId tabType hl_pie updatePie'
 
-updatePie :: HasNodeStory env err m
+updatePie :: (HasNodeStory env err m, MonadLogger m)
           => CorpusId
           -> Maybe ListId
           -> TabType
           -> m ()
 updatePie cId mListId tabType = do
   listId <- getListOrDefault cId mListId
-  printDebug "[updatePie] cId" cId
-  printDebug "[updatePie] mListId" mListId
-  printDebug "[updatePie] tabType" tabType
+  $(logLocM) DEBUG $ "[updatePie] cId: " <> show cId
+  $(logLocM) DEBUG $ "[updatePie] mListId: " <> show mListId
+  $(logLocM) DEBUG $ "[updatePie] tabType: " <> show tabType
   _ <- updatePie' cId listId tabType
   pure ()
 
@@ -218,7 +220,7 @@ getTree :: HasNodeStory env err m
 getTree cId maybeListId tabType listType = do
   metricsGetter cId maybeListId tabType hl_tree (\cId' l tt -> updateTree' cId' l tt listType)
 
-updateTree :: HasNodeStory env err m
+updateTree :: (HasNodeStory env err m, MonadLogger m)
            => CorpusId
            -> Maybe ListId
            -> TabType
@@ -226,10 +228,10 @@ updateTree :: HasNodeStory env err m
            -> m ()
 updateTree cId mListId tabType listType = do
   listId <- getListOrDefault cId mListId
-  printDebug "[updateTree] cId" cId
-  printDebug "[updateTree] mListId" mListId
-  printDebug "[updateTree] tabType" tabType
-  printDebug "[updateTree] listType" listType
+  $(logLocM) DEBUG $ "[updateTree] cId: " <> show cId
+  $(logLocM) DEBUG $ "[updateTree] mListId: " <> show mListId
+  $(logLocM) DEBUG $ "[updateTree] tabType: " <> show tabType
+  $(logLocM) DEBUG $ "[updateTree] listType: " <> show listType
   _ <- updateTree' cId listId tabType listType
   pure ()
 

src/Gargantext/API/Server/Named/Ngrams.hs

@@ -75,7 +75,8 @@ apiNgramsAsync nId =
     }
 
 tableNgramsPostChartsAsync :: ( HasNodeStory env err m
-                              , MonadJobStatus m )
+                              , MonadJobStatus m
+                              , MonadLogger m )
                             => UpdateTableNgramsCharts
                             -> JobHandle m
                             -> m ()