Commit 1d31e207 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX][WIP] Orchestrator is back.

parent a580e527
Pipeline #613 failed with stage
...@@ -180,7 +180,7 @@ library: ...@@ -180,7 +180,7 @@ library:
- servant-auth-swagger - servant-auth-swagger
- servant-blaze - servant-blaze
- servant-client - servant-client
# - servant-job - servant-job
- servant-mock - servant-mock
- servant-multipart - servant-multipart
- servant-server - servant-server
......
...@@ -49,7 +49,7 @@ import qualified Data.ByteString.Lazy as L ...@@ -49,7 +49,7 @@ import qualified Data.ByteString.Lazy as L
import Servant import Servant
import Servant.Auth.Server (defaultJWTSettings, JWTSettings, CookieSettings, defaultCookieSettings, readKey, writeKey) import Servant.Auth.Server (defaultJWTSettings, JWTSettings, CookieSettings, defaultCookieSettings, readKey, writeKey)
import Servant.Client (BaseUrl, parseBaseUrl) import Servant.Client (BaseUrl, parseBaseUrl)
--import Servant.Job.Async (newJobEnv, defaultSettings) import Servant.Job.Async (newJobEnv, defaultSettings)
import Web.HttpApiData (parseUrlPiece) import Web.HttpApiData (parseUrlPiece)
import Control.Concurrent import Control.Concurrent
...@@ -61,7 +61,7 @@ import Control.Lens ...@@ -61,7 +61,7 @@ import Control.Lens
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Database.Utils (databaseParameters, HasConnection(..), Cmd', runCmd) import Gargantext.Database.Utils (databaseParameters, HasConnection(..), Cmd', runCmd)
import Gargantext.API.Ngrams (NgramsRepo, HasRepoVar(..), HasRepoSaver(..), HasRepo(..), RepoEnv(..), r_version, saveRepo, initRepo, renv_var, renv_lock) import Gargantext.API.Ngrams (NgramsRepo, HasRepoVar(..), HasRepoSaver(..), HasRepo(..), RepoEnv(..), r_version, saveRepo, initRepo, renv_var, renv_lock)
--import Gargantext.API.Orchestrator.Types import Gargantext.API.Orchestrator.Types
type PortNumber = Int type PortNumber = Int
...@@ -142,7 +142,7 @@ data Env = Env ...@@ -142,7 +142,7 @@ data Env = Env
, _env_repo :: !RepoEnv , _env_repo :: !RepoEnv
, _env_manager :: !Manager , _env_manager :: !Manager
, _env_self_url :: !BaseUrl , _env_self_url :: !BaseUrl
--, _env_scrapers :: !ScrapersEnv , _env_scrapers :: !ScrapersEnv
} }
deriving (Generic) deriving (Generic)
...@@ -241,7 +241,7 @@ newEnv port file = do ...@@ -241,7 +241,7 @@ newEnv port file = do
param <- databaseParameters file param <- databaseParameters file
conn <- connect param conn <- connect param
repo <- readRepoEnv repo <- readRepoEnv
--scrapers_env <- newJobEnv defaultSettings manager scrapers_env <- newJobEnv defaultSettings manager
logger <- newStderrLoggerSet defaultBufSize logger <- newStderrLoggerSet defaultBufSize
pure $ Env pure $ Env
...@@ -250,7 +250,7 @@ newEnv port file = do ...@@ -250,7 +250,7 @@ newEnv port file = do
, _env_conn = conn , _env_conn = conn
, _env_repo = repo , _env_repo = repo
, _env_manager = manager , _env_manager = manager
--, _env_scrapers = scrapers_env , _env_scrapers = scrapers_env
, _env_self_url = self_url , _env_self_url = self_url
} }
......
...@@ -36,7 +36,9 @@ extra-deps: ...@@ -36,7 +36,9 @@ extra-deps:
- git: https://gitlab.iscpif.fr/gargantext/patches-class - git: https://gitlab.iscpif.fr/gargantext/patches-class
commit: 746b4ce0af8f9e600d555ad7e5b2973a940cdad9 commit: 746b4ce0af8f9e600d555ad7e5b2973a940cdad9
#- git: https://github.com/np/servant-job.git #- git: https://github.com/np/servant-job.git
# commit: ac4227441bbca30c44235582b5ec31340c569021 #commit: ac4227441bbca30c44235582b5ec31340c569021
- git: https://github.com/delanoe/servant-job.git
commit: ea1746d43c7992a953c1eb4ed2614df2630d98ce
- git: https://gitlab.iscpif.fr/gargantext/clustering-louvain.git - git: https://gitlab.iscpif.fr/gargantext/clustering-louvain.git
commit: 1c636112b151110408e7c5a28cec39e46657358e commit: 1c636112b151110408e7c5a28cec39e46657358e
- git: https://github.com/np/patches-map - git: https://github.com/np/patches-map
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment