1087 Commits

Author SHA1 Message Date
geffzhang
4a0d355446
Merge pull request #45 from ThreeMammals/develop
merge newest code
2018-05-13 11:22:10 +08:00
Tom Pallister
dadb43ef6f Merge branch 'davidni-davidni/netstandard' into develop 2018-05-11 07:59:27 +01:00
Tom Pallister
1823c832a6 +semver: major merged netstandard2.0 upgrade and updated all packages. Also had to change identity server test due to scope deduping and put a few awaits in. 2018-05-11 07:59:03 +01:00
David Nissimoff
7345bdccda README improvements 2018-05-10 16:22:27 -07:00
David Nissimoff
5c0498cba0 Updated README 2018-05-10 16:20:13 -07:00
David Nissimoff
b1641e003c netstandard2.0 support 2018-05-10 16:12:36 -07:00
Tom Gardham-Pallister
aa3de16464 skip raft tests but merging all the other hardening i did in that branch 2018-05-09 18:42:10 +01:00
Tom Gardham-Pallister
e32823c58b Merge branch 'feature/fix-unstable-raft-tests' into develop 2018-05-09 18:41:11 +01:00
Tom Gardham-Pallister
22fc8668af hacking around 2018-05-08 22:57:59 +01:00
Tom Pallister
4e17190b3f
Feature/service discovery config key (#347)
* #346 make service discoery config key configurable

* #346 missed this test

* #346 updated docs
2018-05-08 21:18:38 +01:00
Tom Pallister
66bc6203ad added cache back in 2018-05-07 09:03:15 +01:00
Tom Pallister
66a1bfc257 identified tests are failing because sometimes more than one log entry in raft, this is deffo wrong, also made int tests not use cache manager 2018-05-07 09:00:41 +01:00
Tom Pallister
54c7464919 change to firm up consul tests 2018-05-07 08:25:16 +01:00
Tom Gardham-Pallister
a2c7fda4c9 test should be at least once 2018-05-06 18:43:24 +01:00
Tom Pallister
5ed8257a58 still trying to get these stable 2018-05-05 16:31:40 +01:00
Tom Pallister
b536a88dca sorted sticky session cookie tests 2018-05-05 15:42:26 +01:00
Tom Pallister
fb3af754ab implemented a send to self pattern for sticky session timeouts rather than a normal timer 2018-05-05 13:43:38 +01:00
Tom Gardham-Pallister
c041d90e38 more messing with send ot self 2018-05-05 12:53:19 +01:00
Tom Gardham-Pallister
17a515c4c0 sticking send messages toself in to make this testable 2018-05-05 10:38:47 +01:00
Tom Gardham-Pallister
4c405f0f29 revert 2018-05-03 23:00:40 +01:00
Tom Gardham-Pallister
da0dd68502 another quick hack to work this out 2018-05-03 22:49:44 +01:00
Tom Gardham-Pallister
334d4bf368 another quick hack to work this out 2018-05-03 22:32:07 +01:00
Tom Gardham-Pallister
e57b72173e changes to make test more stable 2018-05-03 22:06:08 +01:00
Tom Gardham-Pallister
2f8d857731 pass expiry period into cookie thing to make this more testable 2018-05-03 21:34:22 +01:00
Tom Gardham-Pallister
003fff8b24 #245 hacked these tests around and they are now passing 5 runs in a row on my mac, lets see on build server 2018-05-01 22:07:56 +01:00
geffzhang
03abfca543
Merge pull request #44 from ThreeMammals/develop
merge newest code
2018-05-01 08:34:50 +08:00
Tom Pallister
6793278597
Feature/sticky sessions (#336)
* started messing around with sticky sessions idea

* more tests for sticky session thing

* more faffing cant make up my mind how to do this

* +semver: breaking added sticky session load balancer and changed way load balancer configuration is set by user

* #336 made tests BDDFy
2018-04-30 18:55:11 +01:00
Joel Dean
97e7d32d14 Changed the word worth to work (#337)
Minor typo fix.
2018-04-30 10:30:16 +01:00
Dilsy99
d2432cf7f7 Develop (#338)
* #330 Fix and issue with the httpclient being cached on the url but not taking the http verb into accont. This caused an issue because if the same url but different verbs had handlers, the incorrect handler would be called

* Amend so that UnableToCompleteRequestError returns 500 rather than 404. This error occur when a delegate handler throws an exception

* Fix test that broke because of the change from 404 to 500 when delegate changes
2018-04-30 10:23:02 +01:00
Tom Pallister
e9106c30ee
finally got around to writing some tests for consul file config repo! Should have done these before I wrote it sigh.. 2018-04-26 21:01:51 +01:00
Tom Pallister
5b63f333f7
#262 added working eureka sample (#333) 2018-04-26 09:38:36 +01:00
Dilsy99
027bf6867a #330 Fix and issue with the httpclient being cached on the url but not taking the http verb into accont. This caused an issue because if the same url but different verbs had handlers, the incorrect handler would be called (#331) 2018-04-25 16:46:41 +01:00
geffzhang
2d01e96369
Merge pull request #43 from ThreeMammals/develop
merge newest code
2018-04-25 21:30:14 +08:00
Tom Pallister
fad190fcae
Feature/extra request id test (#329)
* messing around with benchmark.net.seems Ocelot adds about 2ms to a request..lets make this less? :)

* #326 store json indented so it looks nice :P

* #327 show another test how request id works
2018-04-24 08:30:45 +01:00
Tom Pallister
77211e9f16
Feature/store configuraton json idented (#328)
* messing around with benchmark.net.seems Ocelot adds about 2ms to a request..lets make this less? :)

* #326 store json indented so it looks nice :P
2018-04-24 08:30:17 +01:00
Tom Pallister
636d116491
#309 allow users to ignore ssl warnings, not sure this is advisable (#325)
* #309 allow users to ignore ssl warnings, not sure this is advisable

* #309 docs for ssl ignore
2018-04-22 12:05:49 +01:00
Tom Pallister
4f061f2b74
Feature/steeltoe (#324)
* #262 - Integrated Steeltoe Service Discovery with Ocelot for review.

* messing around

* seems to be working with eureka

* acceptance test passing with external lib references

* #262 support for netflix eureka service discovery thanks to pivotal

* #262 fixed warnings
2018-04-20 21:28:49 +01:00
Joseph Bales
a5f3e0fa75 Fixing documentation typo (#321) 2018-04-18 20:36:35 +01:00
Tom Pallister
5e1605882b
Feature/timeout for http client (#319)
* #318 http client obeys Qos timeout or defaults to 90 seconds, which is think is default for http client anyway but zero docs....

* #318 updated docs to specify default timeout and make it clear how to set it on a ReRoute basis

* #318 missed this

* #318 missed this
2018-04-18 15:24:16 +01:00
Tom Pallister
f9dc8659c0 forgot to update docs 2018-04-18 08:48:21 +01:00
Tom Pallister
2791cef0e0 merged develop 2018-04-18 08:32:15 +01:00
Tom Pallister
2b8c905a26 #296 remembered how to regex 2018-04-18 08:27:23 +01:00
Tom Pallister
aa55fe34cb
Feature/merge configuration files (#316)
* #296 renamed configuration.json to ocelot.json in preparation

* removed things we dont need for tests

* another file we dont need

* removed some async we dont need

* refactoring to consolidate configuration code

* removed another pointless abstraction

* #296 started writing merge code

* #296 coming up with ideas for this config merging

* #296 still hacking this idea around

* #296 will now do a crappy merge on the configuration

* #296 change so tests pass on windows
2018-04-17 22:06:41 +01:00
Tom Pallister
e94df4749c #296 change so tests pass on windows 2018-04-17 21:51:41 +01:00
Tom Gardham-Pallister
b7ff73729f #296 merged develop into this branch 2018-04-17 19:45:27 +01:00
Louis B
3607c0867e Update middlewareinjection.rst (#317)
Class name "OcelotMiddlewareConfiguration" does not exist and "UseOcelot" extension method expects a "OcelotPipelineConfiguration" so i think this documentaiton is outdated.
2018-04-17 19:27:16 +01:00
Tom Gardham-Pallister
2ed37cbc83 #296 will now do a crappy merge on the configuration 2018-04-16 20:28:15 +01:00
Tom Gardham-Pallister
c5aa11f7fb #296 still hacking this idea around 2018-04-15 18:06:03 +01:00
Tom Pallister
3ae2b286ab #296 coming up with ideas for this config merging 2018-04-15 09:20:52 +01:00
Tom Pallister
7ca828836a #296 started writing merge code 2018-04-14 07:02:17 +01:00