Merge lp:~thumper/juju-core/fix-default-http into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Don't replace the default http transport.

The local provider is currently broken as the file protocol
is registered in one init block, and the default transport
is replaced in another init block.

This change just avoids replacing the default transport in
an init block.

Don't replace the default http transport.

The local provider is currently broken as the file protocal
is registered in one init block, and the default transport
is replaced in another init block.

This change just avoids replacing the default transport in
an init block.

https://codereview.appspot.com/15660043/

[Tim Penhey (thumper)]

Reviewers: mp+192034_code.launchpad.net,

Message:
Please take a look.

Description:
Don't replace the default http transport.

The local provider is currently broken as the file protocal
is registered in one init block, and the default transport
is replaced in another init block.

This change just avoids replacing the default transport in
an init block.

https://code.launchpad.net/~thumper/juju-core/fix-default-http/+merge/192034

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/15660043/

Affected files (+5, -3 lines):
   A [revision details]
   M cmd/cmd.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131018031007-g87i6t5sgxtr7gxl
+New revision: <email address hidden>

Index: cmd/cmd.go
=== modified file 'cmd/cmd.go'
--- cmd/cmd.go 2013-10-17 22:48:19 +0000
+++ cmd/cmd.go 2013-10-21 18:10:36 +0000
@@ -15,12 +15,12 @@
   "strings"

   "launchpad.net/gnuflag"
-
- "launchpad.net/juju-core/utils"
  )

  func init() {
- http.DefaultTransport = utils.NewHttpTransport()
+ // Don't replace the default transport as other init blocks
+ // register protocols.
+ http.DefaultTransport.(*http.Transport).DisableKeepAlives = true
  }

  // ErrSilent can be returned from Run to signal that Main should exit with

[Dave Cheney (dave-cheney)]

LGTM.

On Tue, Oct 22, 2013 at 5:24 AM, Tim Penhey <email address hidden> wrote:
> Reviewers: mp+192034_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> Don't replace the default http transport.
>
> The local provider is currently broken as the file protocal
> is registered in one init block, and the default transport
> is replaced in another init block.
>
> This change just avoids replacing the default transport in
> an init block.
>
> https://code.launchpad.net/~thumper/juju-core/fix-default-http/+merge/192034
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/15660043/
>
> Affected files (+5, -3 lines):
> A [revision details]
> M cmd/cmd.go
>
>
> Index: [revision details]
> === added file '[revision details]'
> --- [revision details] 2012-01-01 00:00:00 +0000
> +++ [revision details] 2012-01-01 00:00:00 +0000
> @@ -0,0 +1,2 @@
> +Old revision: tarmac-20131018031007-g87i6t5sgxtr7gxl
> +New revision: <email address hidden>
>
> Index: cmd/cmd.go
> === modified file 'cmd/cmd.go'
> --- cmd/cmd.go 2013-10-17 22:48:19 +0000
> +++ cmd/cmd.go 2013-10-21 18:10:36 +0000
> @@ -15,12 +15,12 @@
> "strings"
>
> "launchpad.net/gnuflag"
> -
> - "launchpad.net/juju-core/utils"
> )
>
> func init() {
> - http.DefaultTransport = utils.NewHttpTransport()
> + // Don't replace the default transport as other init blocks
> + // register protocols.
> + http.DefaultTransport.(*http.Transport).DisableKeepAlives = true
> }
>
> // ErrSilent can be returned from Run to signal that Main should exit with
>
>
>
>
>
> --
> https://code.launchpad.net/~thumper/juju-core/fix-default-http/+merge/192034
> You are subscribed to branch lp:juju-core.

=== modified file 'cmd/cmd.go'
--- cmd/cmd.go	2013-10-17 22:48:19 +0000
+++ cmd/cmd.go	2013-10-21 18:22:37 +0000
@@ -15,12 +15,12 @@
 	"strings"
 
 	"launchpad.net/gnuflag"
-
-	"launchpad.net/juju-core/utils"
 )
 
 func init() {
-	http.DefaultTransport = utils.NewHttpTransport()
+	// Don't replace the default transport as other init blocks
+	// register protocols.
+	http.DefaultTransport.(*http.Transport).DisableKeepAlives = true
 }
 
 // ErrSilent can be returned from Run to signal that Main should exit with