Skip to content

Integrate progress #40

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.

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 106 commits into from
May 28, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
1591a05
Nonfunctional partial implementation of call graph generation
almacken Jun 21, 2018
63e480e
"Working" implementation of call graph generation
almacken Jul 4, 2018
02cd16d
Call graph generation much more efficient, can handle larger samples.
almacken Jul 12, 2018
d4e49eb
Merge branch 'feature/streamworkaround' of https://github.com/delphi-…
almacken Jul 17, 2018
8c27117
Merge remote-tracking branch 'origin/develop' into develop
almacken Jul 25, 2018
6f8812b
Merge remote-tracking branch 'origin/develop' into develop
almacken Jul 26, 2018
afc2e22
Implemented loading Jars from remote streams, misc. bug fixes
almacken Jul 26, 2018
6e6a675
Implemented a Preflight check connecting to the Instance Registry
Aug 1, 2018
301ca2f
Stream gracefully drops any error-causing elements
almacken Aug 2, 2018
7edf235
ElasticSearch instance can now be set to the one responded by th IR
Aug 7, 2018
738f1b9
Merge remote-tracking branch 'origin/develop' into develop
almacken Aug 7, 2018
5e3583f
Invalid version numbers are now interpreted as the latest version BEF…
almacken Aug 9, 2018
e51d865
Updated badges
bhermann Aug 11, 2018
12a3208
Fixed badge code
bhermann Aug 11, 2018
331f8e9
Fixed badge code
bhermann Aug 11, 2018
f32329e
Fixed badge code
bhermann Aug 11, 2018
a967033
Improved stream structure
almacken Aug 13, 2018
db32618
Added license information
bhermann Aug 14, 2018
68b8689
Added documentation
bhermann Aug 14, 2018
faa03c2
Removed unnecessary output
bhermann Aug 14, 2018
e5145c9
Removed magic number
bhermann Aug 14, 2018
9777aee
Refactoring for storage queries
bhermann Aug 14, 2018
596f37e
Refactoring Hermes processing strain
bhermann Aug 15, 2018
ce56267
Added OPAL configuration
bhermann Aug 15, 2018
5d40624
Code quality
bhermann Aug 15, 2018
4078f9a
Refactored HermesActor
bhermann Aug 15, 2018
ab2bce3
Included client API code from swagger to connect to IR
Aug 21, 2018
c010661
Added some comments describing implementation of call graph stream
almacken Aug 22, 2018
7da8226
Merge branch 'develop' into feature/callGraphGeneration
almacken Aug 23, 2018
d277fce
Fixed some errors with ElasticClient, still going to improve code qua…
almacken Aug 24, 2018
9665292
Migration to elastic4s 6.3.0
bhermann Aug 25, 2018
654e612
Improved code quality
almacken Aug 27, 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
b979f5f
Further improved code quality
almacken Aug 28, 2018
3a1b456
Merge pull request #22 from almacken/feature/callGraphGeneration
bhermann Aug 29, 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
2cf291c
Bumped akka-http version b/c of CVE-2018-16131
bhermann Sep 17, 2018
d66bf31
Merge branch 'develop' into feature/instanceregistry
Sep 19, 2018
44462af
Fixed merge error (missing comma)
Sep 19, 2018
9a2a5b6
Merge pull request #24 from delphi-hub/feature/instanceregistry
bhermann Sep 19, 2018
c63c1c7
Implementation of Stop crawler instance refs #25
Ayybeeshafi Sep 25, 2018
5dc4761
Implementation of stop functionalty of Crawler instance refs #25
Ayybeeshafi Oct 2, 2018
3cd4fc8
Upgraded to new IR API model. Now using spray (de-)serialization.
Oct 7, 2018
858de50
Crawler is now reporting Failure when preflight checks fail, instead …
Oct 8, 2018
5523921
Cleanup of unused code and imports.
Oct 9, 2018
35b656f
Merge branch 'stop-crawler-instance' into feature/newIRApi
Oct 9, 2018
8eca4f8
Refactored Instance model to another package... cleaner like this
bhermann Oct 15, 2018
8ebba09
Orrr...
bhermann Oct 15, 2018
7a77a31
Added new process scheduler
bhermann Oct 16, 2018
72fbf3f
Stable pipeline
bhermann Oct 17, 2018
3ad504e
Adapted test for new ask-style (not pretty... but it works)
bhermann Oct 17, 2018
688c64d
Merge branch 'develop' into feature/newIRApi
Oct 17, 2018
d7a6f9d
Merge branch 'develop' into feature/newIRApi
Oct 18, 2018
eca1872
Renamed file for Actor Signals
bhermann Oct 19, 2018
60d9059
Changed base image for crawler dockerization
bhermann Oct 19, 2018
3a4e0f1
Workaround for Hermes' need for a physical configuration file
bhermann Oct 19, 2018
9e8abc6
Added more detailed error information in case the pre-flight check fa…
bhermann Oct 19, 2018
f47cd97
Merge branch 'develop' into feature/newIRApi
Oct 19, 2018
3435d2e
Codestyle cleanup
Oct 19, 2018
875e55d
Added timeout with regard to issue #27
bhermann Oct 20, 2018
6f3bca9
Added backoff restart to maven discovery source with regard to issue #27
bhermann Oct 20, 2018
553f54a
Added discovery timestamp
bhermann Oct 20, 2018
bf3edee
Added Hermes Version to the index
bhermann Oct 20, 2018
cf2e664
Added JavaFX requirement to README.
bhermann Oct 20, 2018
acba0c9
Corrected grammar mistakes
bhermann Oct 21, 2018
31989ea
Merge remote-tracking branch 'origin/develop' into feature/newIRApi
Oct 21, 2018
66353b5
Replaced usage of 'try-catch' with 'Try' (codestyle)
Oct 21, 2018
2407bc0
Merge pull request #26 from delphi-hub/feature/newIRApi
bhermann Oct 21, 2018
97888f4
Pinned jackson-databind now... *sigh*
bhermann Oct 21, 2018
dbb55ad
Activated configuration reading. Should work for all systems now.
bhermann Oct 22, 2018
fdb8c6d
Added encoding to parts of Maven URLs in order to deal with irregular…
bhermann Oct 23, 2018
fecc237
Made read operation more resilient. Closes #29.
bhermann Oct 24, 2018
bbd97ad
Adapted instance registry client to reflect the interface change in e…
Nov 4, 2018
d67329a
Adapted instance model to reflect latest changes: attribute 'labels' …
Nov 5, 2018
6e72f48
Merge pull request #30 from delphi-hub/feature/newMatchingInterface
bhermann Nov 8, 2018
abac46b
Adapt crawler to latest api changes
Nov 22, 2018
d9bdabb
Merge pull request #33 from delphi-hub/feature/linksAsAttributes
bhermann Nov 24, 2018
03fbf83
Introduced JWT based authorization for registry communication
Jan 3, 2019
9331aee
Codestyle: Inserted spaces before plus sign
Jan 4, 2019
e9b8daf
Merge pull request #35 from delphi-hub/feature/authentication
bhermann Jan 4, 2019
e668109
Adapted registry interface to newest API version
Jan 22, 2019
9c8e200
Fixed variable name being uppercase (codestyle)
Feb 7, 2019
1ac5941
Merge pull request #36 from delphi-hub/feature/newRegistryAPI
bhermann Feb 7, 2019
d23256c
Updated the jackson version to 2.9.9 to fix the dependency vulnerabil…
SViktorS May 25, 2019
1e498b5
Adding packages to travis config
bhermann May 28, 2019
3095278
Moving to Oracle JDK 8
bhermann May 28, 2019
30c39ff
bumping to 9 *sigh*
bhermann May 28, 2019
e47f243
Guessing tbh
bhermann May 28, 2019
cfdb10a
Merge branch 'develop' into feature/jacksonVulnerability
bhermann May 28, 2019
1ca63b1
Merge pull request #38 from delphi-hub/feature/jacksonVulnerability
bhermann May 28, 2019
05ee37d
Merge branch 'master' into develop
bhermann May 28, 2019
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
Moved default host to val, removed unused resolver/unnecessary condition
  • Loading branch information
Johannes Duesing committed Sep 8, 2018
commit 81e8482c6e980ef9d17ef0a0fee62cd4e81e7d01
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ libraryDependencies ++= Seq(
)

resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
resolvers ++= Seq(Resolver.mavenLocal)

val opalVersion = "1.0.0"
libraryDependencies ++= Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,26 @@ class Configuration {

lazy val elasticsearchClientUri: ElasticsearchClientUri = ElasticsearchClientUri({
if(elasticsearchInstance.portnumber.isEmpty){
elasticsearchInstance.iP.getOrElse("elasticsearch://localhost:" + defaultElasticSearchPort)
elasticsearchInstance.iP.getOrElse(defaultElasticSearchHost + ":" + defaultElasticSearchPort)
}else{
elasticsearchInstance.iP.getOrElse("elasticsearch://localhost") + ":" + elasticsearchInstance.portnumber.getOrElse(defaultElasticSearchPort)
elasticsearchInstance.iP.getOrElse(defaultElasticSearchHost) + ":" + elasticsearchInstance.portnumber.getOrElse(defaultElasticSearchPort)
}
})

lazy val elasticsearchInstance : Instance = InstanceRegistry.retrieveElasticSearchInstance(this) match {
case Success(instance) => instance
case Failure(_) => Instance(
None,
Some(sys.env.getOrElse("DELPHI_ELASTIC_URI","elasticsearch://localhost")),
Some(defaultElasticSearchPort),
Some(sys.env.getOrElse("DELPHI_ELASTIC_URI",defaultElasticSearchHost + ":" + defaultElasticSearchPort)),
None,
Some("Default ElasticSearch instance"),
Some(ComponentType.ElasticSearch))
}

val mavenRepoBase: URI = new URI("http://repo1.maven.org/maven2/") // TODO: Create a local demo server "http://localhost:8881/maven2/"
val controlServerPort : Int = 8882
val defaultElasticSearchPort : Int = 9200
val defaultElasticSearchHost : String = "elasticsearch://localhost"
val limit : Int = 50
val throttle : Throttle = Throttle(5, 30 second, 5, ThrottleMode.shaping)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ object ElasticReachablePreflightCheck extends PreflightCheck {
val f = (client.execute {
nodeInfo()
} map { i => {
if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(isElasticSearchReachable = true, configuration)
InstanceRegistry.sendMatchingResult(isElasticSearchReachable = true, configuration)
Success(configuration)
}
} recover { case e =>
if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(isElasticSearchReachable = false, configuration)
InstanceRegistry.sendMatchingResult(isElasticSearchReachable = false, configuration)
Failure(e)

}).andThen {
Expand Down