X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_misc.ml;h=897442e63206e90fcc0f9d25f7f7844836e31af2;hb=7668522147126e620258e6d22c16a2b0fa56feb4;hp=6f612cc30aead385867a3965bf9e45991e271701;hpb=2f9a5abbd182b6ef3768c9137bb19afed2ee6bf2;p=helm.git diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml index 6f612cc30..897442e63 100644 --- a/helm/ocaml/getter/http_getter_misc.ml +++ b/helm/ocaml/getter/http_getter_misc.ml @@ -28,8 +28,6 @@ open Printf -open Http_getter_debugger - let trailing_dot_gz_RE = Pcre.regexp "\\.gz$" (* for g{,un}zip *) let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$" let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://" @@ -78,7 +76,7 @@ let cp src dst = close_in ic; close_out oc let wget ?output url = - debug_print + Http_getter_logger.log (sprintf "wgetting %s (output: %s)" url (match output with None -> "default" | Some f -> f)); match url with @@ -103,7 +101,8 @@ let wget ?output url = let gzip ?(keep = false) ?output fname = let output = match output with None -> fname ^ ".gz" | Some fname -> fname in - debug_print (sprintf "gzipping %s (keep: %b, output: %s)" fname keep output); + Http_getter_logger.log ~level:3 + (sprintf "gzipping %s (keep: %b, output: %s)" fname keep output); let (ic, oc) = (open_in fname, Gzip.open_out output) in let buf = String.create bufsiz in (try @@ -128,8 +127,8 @@ let gunzip ?(keep = false) ?output fname = "Http_getter_misc.gunzip: unable to determine output file name" | Some fname -> fname in - debug_print (sprintf "gunzipping %s (keep: %b, output: %s)" - fname keep output); + Http_getter_logger.log ~level:3 + (sprintf "gunzipping %s (keep: %b, output: %s)" fname keep output); let (ic, oc) = (Gzip.open_in fname, open_out output) in let buf = String.create bufsiz in (try @@ -198,7 +197,7 @@ let http_get url = try Some (Http_client.http_get url) with e -> - prerr_endline (sprintf + Http_getter_logger.log (sprintf "Warning: Http_client failed on url %s with exception: %s" url (Printexc.to_string e)); None