Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resync oxy with original repository #2451

Merged
merged 1 commit into from Nov 22, 2017
Merged

Resync oxy with original repository #2451

merged 1 commit into from Nov 22, 2017

Conversation

juliens
Copy link
Member

@juliens juliens commented Nov 22, 2017 •
edited by ldez

What does this PR do?

We re-synchronize the vulcand/oxy repository.

Motivation

(next step) We want to delete the fork. 馃帀

More

Just for now, we keep the fork for 2 reasons

  • The PRs are still open on the original repository, and we are waiting for the merge
  • Oxy now use sirupsen/logrus, and we use Sirupsen/logrus, all the PR are waiting for merge to migrate to sirupsen/logrus (docker stack / libkermit stack, rancher metadata, lego transitive dependency)

The main changes/impacts:

  • We don't override the oxy logger anymore
  • All request are in "stream" mode
  • The stream mode flush the response every 100ms (instead of in the Write)
  • We use httputil.ReverseProxy

fixes #2390, #1323

related to:
vulcand/oxy#97
vulcand/oxy#42
vulcand/oxy#99
vulcand/oxy#103
vulcand/oxy#104

@juliens juliens added this to the 1.5 milestone Nov 22, 2017
nmengin
nmengin approved these changes Nov 22, 2017
View reviewed changes
Copy link
Contributor

@nmengin nmengin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

mmatur
mmatur approved these changes Nov 22, 2017
View reviewed changes
Copy link
Member

@mmatur mmatur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@juliens juliens force-pushed the maj-oxy branch 3 times, most recently from f0ba00b to 8eebcab Compare November 22, 2017 16:50
ldez
ldez approved these changes Nov 22, 2017
View reviewed changes
Copy link
Member

@ldez ldez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@traefiker traefiker merged commit bee8ebb into traefik:master Nov 22, 2017
@ldez ldez mentioned this pull request Nov 30, 2017
Closed
@juliens juliens deleted the maj-oxy branch January 25, 2018 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmatur mmatur mmatur approved these changes

@ldez ldez ldez approved these changes

@nmengin nmengin nmengin approved these changes

Assignees
No one assigned
Labels
area/oxy kind/enhancement a new or improved feature. size/S
Projects
None yet
Milestone
1.5
Development

Successfully merging this pull request may close these issues.

Merge containous/oxy fork with vulcand/oxy
5 participants
@juliens @mmatur @ldez @nmengin @traefiker