[Xen-API] [PATCH 2 of 5] CA-33440: the 'getpid' function has moved into the stunnel module

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1261410030 0
# Node ID 3eaa36a3803c23f912d2a2e4d46638313ca8af01
# Parent  3b43ad69a94a6ad46e996dd5b2b566d5502111af
CA-33440: the 'getpid' function has moved into the stunnel module

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 3b43ad69a94a -r 3eaa36a3803c ocaml/database/master_connection.ml
--- a/ocaml/database/master_connection.ml       Mon Dec 21 15:40:30 2009 +0000
+++ b/ocaml/database/master_connection.ml       Mon Dec 21 15:40:30 2009 +0000
@@ -38,7 +38,7 @@
   match !my_connection with
     None -> ()
   | Some st_proc ->
-      Unix.kill (Forkhelpers.getpid st_proc.Stunnel.pid) Sys.sigterm
+      Unix.kill (Stunnel.getpid st_proc.Stunnel.pid) Sys.sigterm
        
 (* whenever a call is made that involves read/write to the master connection, 
a timestamp is
    written into this global: *)
diff -r 3b43ad69a94a -r 3eaa36a3803c ocaml/idl/ocaml_backend/xmlrpcclient.ml
--- a/ocaml/idl/ocaml_backend/xmlrpcclient.ml   Mon Dec 21 15:40:30 2009 +0000
+++ b/ocaml/idl/ocaml_backend/xmlrpcclient.ml   Mon Dec 21 15:40:30 2009 +0000
@@ -331,7 +331,7 @@
       let unique_id = get_new_stunnel_id () in
       Stunnel.connect ~use_external_fd_wrapper ~write_to_log ~unique_id 
~verify_cert ~extended_diagnosis:true host port in
   let s = st_proc.Stunnel.fd in
-  let s_pid = Forkhelpers.getpid st_proc.Stunnel.pid in
+  let s_pid = Stunnel.getpid st_proc.Stunnel.pid in
   begin
     match task_id with
         None -> debug "Did not write stunnel pid: no task passed to http_rpc 
fn"
diff -r 3b43ad69a94a -r 3eaa36a3803c ocaml/perftest/instrumented_xmlrpcclient.ml
--- a/ocaml/perftest/instrumented_xmlrpcclient.ml       Mon Dec 21 15:40:30 
2009 +0000
+++ b/ocaml/perftest/instrumented_xmlrpcclient.ml       Mon Dec 21 15:40:30 
2009 +0000
@@ -327,7 +327,7 @@
       let unique_id = get_new_stunnel_id () in
       Stunnel.connect ~use_external_fd_wrapper ~write_to_log ~unique_id host 
port in
   let s = st_proc.Stunnel.fd in
-  let s_pid = Forkhelpers.getpid st_proc.Stunnel.pid in
+  let s_pid = Stunnel.getpid st_proc.Stunnel.pid in
     begin
       match task_id with
           None -> debug "Did not write stunnel pid: no task passed to http_rpc 
fn"
3 files changed, 3 insertions(+), 3 deletions(-)
ocaml/database/master_connection.ml         |    2 +-
ocaml/idl/ocaml_backend/xmlrpcclient.ml     |    2 +-
ocaml/perftest/instrumented_xmlrpcclient.ml |    2 +-

Attachment: xen-api.hg-5.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api