Skip to content

The Crawler now registers itself at the instance registry #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Sep 19, 2018
Merged

The Crawler now registers itself at the instance registry #24

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6e6a675
Implemented a Preflight check connecting to the Instance Registry
Aug 1, 2018
7edf235
ElasticSearch instance can now be set to the one responded by th IR
Aug 7, 2018
ab2bce3
Included client API code from swagger to connect to IR
Aug 21, 2018
bb3d605
Used akka http to call IR instead of outdated spray http
Aug 28, 2018
c2c9801
Removed unused swagger code, used logger where println was used
Aug 28, 2018
3439480
Crawler can now get elastic search ip from IR
Aug 28, 2018
bf368e8
Cleaned up unused dependencies, fixed some minor bugs
Sep 1, 2018
ba109f6
Crawler now reads its assigned IP after registration at the Instance …
Sep 1, 2018
c67ce57
Made posting matching-result work by storing the matched ElasticSearc…
Sep 2, 2018
51fe0b1
Crawler is now deregistering itself from the Instance Registry on shu…
Sep 4, 2018
d9111f6
Merge remote-tracking branch 'origin/develop' into feature/instancere…
Sep 4, 2018
0d6b1a9
Code style cleanup
Sep 5, 2018
18a71a0
Restored setting of Hermes config, fails on Linux and Windows
Sep 7, 2018
cc45162
CodeStyle: Replaced .get with .getOrElse
Sep 7, 2018
81e8482
Moved default host to val, removed unused resolver/unnecessary condition
Sep 8, 2018
10fb5bc
Made class 'Instance' not use Options anymore
Sep 9, 2018
1e8ec5e
Fixed shutdown hook not being triggered, fixed port of IR
Sep 9, 2018
b2458f0
Better handling of getMatchingInstance returning 404
Sep 12, 2018
c2d86be
Adapted IR communication to use new attribute names
Sep 12, 2018
3372a89
CodeStyle: Replaced if-else if with match-case
Sep 14, 2018
d66bf31
Merge branch 'develop' into feature/instanceregistry
Sep 19, 2018
44462af
Fixed merge error (missing comma)
Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into feature/instanceregistry
  • Loading branch information
Johannes Duesing committed Sep 19, 2018
commit d66bf31616c1f5730af10320c255e60e040c7e46
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe.akka" %% "akka-http" % "10.1.4",
"com.typesafe.akka" %% "akka-http-spray-json" % "10.0.8"
"com.typesafe.akka" %% "akka-http" % "10.1.5"
)

libraryDependencies += "org.json4s" %% "json4s-jackson" % "3.5.3"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.