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
147
Issues
147
List
Board
Labels
Milestones
Merge Requests
6
Merge Requests
6
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
1d31e207
Commit
1d31e207
authored
Nov 13, 2019
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX][WIP] Orchestrator is back.
parent
a580e527
Pipeline
#613
failed with stage
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
7 deletions
+9
-7
package.yaml
package.yaml
+1
-1
Orchestrator.hs
src/Gargantext/API/Orchestrator.hs
+0
-0
Schedule.hs
src/Gargantext/API/Orchestrator/Scrapy/Schedule.hs
+0
-0
Types.hs
src/Gargantext/API/Orchestrator/Types.hs
+0
-0
Settings.hs
src/Gargantext/API/Settings.hs
+5
-5
stack.yaml
stack.yaml
+3
-1
No files found.
package.yaml
View file @
1d31e207
...
...
@@ -180,7 +180,7 @@ library:
-
servant-auth-swagger
-
servant-blaze
-
servant-client
#
- servant-job
-
servant-job
-
servant-mock
-
servant-multipart
-
servant-server
...
...
src/Gargantext/API/Orchestrator.
_
hs
→
src/Gargantext/API/Orchestrator.hs
View file @
1d31e207
File moved
src/Gargantext/API/Orchestrator/Scrapy/Schedule.
_
hs
→
src/Gargantext/API/Orchestrator/Scrapy/Schedule.hs
View file @
1d31e207
File moved
src/Gargantext/API/Orchestrator/Types.
_
hs
→
src/Gargantext/API/Orchestrator/Types.hs
View file @
1d31e207
File moved
src/Gargantext/API/Settings.hs
View file @
1d31e207
...
...
@@ -49,7 +49,7 @@ import qualified Data.ByteString.Lazy as L
import
Servant
import
Servant.Auth.Server
(
defaultJWTSettings
,
JWTSettings
,
CookieSettings
,
defaultCookieSettings
,
readKey
,
writeKey
)
import
Servant.Client
(
BaseUrl
,
parseBaseUrl
)
--
import Servant.Job.Async (newJobEnv, defaultSettings)
import
Servant.Job.Async
(
newJobEnv
,
defaultSettings
)
import
Web.HttpApiData
(
parseUrlPiece
)
import
Control.Concurrent
...
...
@@ -61,7 +61,7 @@ import Control.Lens
import
Gargantext.Prelude
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.Orchestrator.Types
import
Gargantext.API.Orchestrator.Types
type
PortNumber
=
Int
...
...
@@ -142,7 +142,7 @@ data Env = Env
,
_env_repo
::
!
RepoEnv
,
_env_manager
::
!
Manager
,
_env_self_url
::
!
BaseUrl
--
, _env_scrapers :: !ScrapersEnv
,
_env_scrapers
::
!
ScrapersEnv
}
deriving
(
Generic
)
...
...
@@ -241,7 +241,7 @@ newEnv port file = do
param
<-
databaseParameters
file
conn
<-
connect
param
repo
<-
readRepoEnv
--
scrapers_env <- newJobEnv defaultSettings manager
scrapers_env
<-
newJobEnv
defaultSettings
manager
logger
<-
newStderrLoggerSet
defaultBufSize
pure
$
Env
...
...
@@ -250,7 +250,7 @@ newEnv port file = do
,
_env_conn
=
conn
,
_env_repo
=
repo
,
_env_manager
=
manager
--
, _env_scrapers = scrapers_env
,
_env_scrapers
=
scrapers_env
,
_env_self_url
=
self_url
}
...
...
stack.yaml
View file @
1d31e207
...
...
@@ -36,7 +36,9 @@ extra-deps:
-
git
:
https://gitlab.iscpif.fr/gargantext/patches-class
commit
:
746b4ce0af8f9e600d555ad7e5b2973a940cdad9
#- 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
commit
:
1c636112b151110408e7c5a28cec39e46657358e
-
git
:
https://github.com/np/patches-map
...
...
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