Skip to content

Loading…

XOP-229: Stunnel_cache fixes. #996

Merged
merged 2 commits into from

3 participants

@jeromemaloberti

No description provided.

jeromemaloberti added some commits
@jeromemaloberti jeromemaloberti XOP-229: Make xenopsd using keep_alive.
Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
516134a
@jeromemaloberti jeromemaloberti XOP-229: Make rrd_updates uses keep_alive=true.
Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
29430f1
@thomassa
Xapi Project member

Looks reasonable to me.

@jonludlam
Xapi Project member

Thanks, @thomassa

@jonludlam jonludlam merged commit 1900a5c into xapi-project:master

1 check passed

Details default Merged build finished.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 1, 2013
  1. @jeromemaloberti

    XOP-229: Make xenopsd using keep_alive.

    jeromemaloberti committed
    Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
  2. @jeromemaloberti

    XOP-229: Make rrd_updates uses keep_alive=true.

    jeromemaloberti committed
    Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
Showing with 2 additions and 2 deletions.
  1. +1 −1 ocaml/rrdd/rrdd_http_handler.ml
  2. +1 −1 ocaml/xenops/xenops_client.ml
View
2 ocaml/rrdd/rrdd_http_handler.ml
@@ -77,7 +77,7 @@ let get_rrd_updates_handler (req : Http.Request.t) (s : Unix.file_descr) _ =
let json = List.mem_assoc "json" query in
let reply = get_host_stats ~json ~start ~interval ~cfopt ~is_host ?uuid () in
let headers = Http.http_200_ok_with_content (Int64.of_int (String.length reply))
- ~version:"1.1" ~keep_alive:false () in
+ ~version:"1.1" ~keep_alive:true () in
let headers =
if json then headers else headers @ [Http.Hdr.content_type ^ ": text/xml"] in
let headers = headers @ [
View
2 ocaml/xenops/xenops_client.ml
@@ -31,7 +31,7 @@ let http_rpc string_of_call response_of_string ~srcstr ~dststr url call =
E.debug "%s=>%s [label=\"%s\"];" srcstr dststr call.Rpc.name;
let req = string_of_call call in
let http_req =
- Http.Request.make ~version:"1.1" ~frame:false ~keep_alive:false ?auth:(Http.Url.auth_of url) ~user_agent:"xenopsd" ~query:(Http.Url.get_query_params url) ~body:req Http.Post (Http.Url.get_uri url) in
+ Http.Request.make ~version:"1.1" ~frame:false ~keep_alive:true ?auth:(Http.Url.auth_of url) ~user_agent:"xenopsd" ~query:(Http.Url.get_query_params url) ~body:req Http.Post (Http.Url.get_uri url) in
Xmlrpc_client.with_transport (transport_of_url url)
(fun fd ->
Http_client.rpc ~use_fastpath:false fd http_req
Something went wrong with that request. Please try again.