X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fmain.ml;h=5f7e8cd93582e94a90dd9bf27619266031451ab8;hb=acf29bdbdcdc6ad8c2d9d27e8a47500981b605cd;hp=44c69610e1d4e0ffffcef79d3c332988e127ed8f;hpb=cb196689329c36dd651513a2859a2f9a714ea07b;p=helm.git diff --git a/helm/http_getter/main.ml b/helm/http_getter/main.ml index 44c69610e..5f7e8cd93 100644 --- a/helm/http_getter/main.ml +++ b/helm/http_getter/main.ml @@ -29,6 +29,7 @@ open Printf open Http_getter_common +open Http_getter_const open Http_getter_misc open Http_getter_types @@ -89,22 +90,41 @@ let parse_rdf_class (req: Http_types.request) = | "backward" -> `Backward | c -> raise (Bad_request ("Invalid RDF class: " ^ c)) +let xml_escape = Netencoding.Html.encode ~in_enc:`Enc_utf8 () + +let html_tag ?exn () = + let xml_decl = "\n" in + match exn with + | Some (exn, arg) -> + let (exn, arg) = (xml_escape exn, xml_escape arg) in + sprintf + "%s\n" + xml_decl xhtml_ns helm_ns exn arg + | None -> + sprintf "%s\n" + xml_decl xhtml_ns helm_ns + let mk_return_fun pp_fun contype msg outchan = Http_daemon.respond ~body:(pp_fun msg) ~headers:["Content-Type", contype] outchan -let pp_error s = - sprintf "Http Getter error: %s" s -let pp_internal_error s = - sprintf "Http Getter Internal error: %s" s -let pp_msg s = sprintf "%s" s +let pp_msg s = sprintf "%s%s" (html_tag ()) s let null_pp s = s -let return_html_error = mk_return_fun pp_error "text/html" -let return_html_internal_error = mk_return_fun pp_internal_error "text/html" -let return_html_msg = mk_return_fun pp_msg "text/html" -let return_html_raw = mk_return_fun null_pp "text/html" +let return_html_error exn = + let pp_error s = + sprintf "%s\nHttp Getter error: %s" + (html_tag ~exn ()) s + in + mk_return_fun pp_error "text/xml" +let return_html_internal_error exn = + let pp_internal_error s = + sprintf "%s\nHttp Getter Internal error: %s" + (html_tag ~exn ()) s + in + mk_return_fun pp_internal_error "text/xml" +let return_html_msg = mk_return_fun pp_msg "text/xml" +let return_html_raw = mk_return_fun null_pp "text/xml" let return_xml_raw = mk_return_fun null_pp "text/xml" -let return_400 body outchan = - Http_daemon.respond_error ~code:(`Code 400) ~body outchan +let return_400 exn body = return_html_error exn body let return_all_foo_uris doctype uris outchan = Http_daemon.send_basic_headers ~code:(`Code 200) outchan; @@ -194,12 +214,14 @@ let return_resolve uri outchan = return_xml_raw (sprintf "\n" (Http_getter.resolve uri)) outchan - with Unresolvable_URI uri -> - return_xml_raw "\n" outchan + with + | Unresolvable_URI _ -> return_xml_raw "\n" outchan + | Key_not_found _ -> return_xml_raw "\n" outchan let return_list_servers outchan = return_html_raw - (sprintf "\n%s\n

" + (sprintf "%s\n%s\n

" + (html_tag ()) (String.concat "\n" (List.map (fun (pos, server) -> @@ -215,9 +237,10 @@ let log_failure msg = Http_getter_logger.log ("Request not fulfilled: " ^ msg) * Channel is closed afterwards. *) let send_log_to ?prepend action outchan = Http_daemon.send_basic_headers ~code:(`Code 200) outchan; - Http_daemon.send_header "Content-Type" "text/html" outchan; + Http_daemon.send_header "Content-Type" "text/xml" outchan; Http_daemon.send_CRLF outchan; - output_string outchan "\n"; flush outchan; + output_string outchan (sprintf "%s\n" (html_tag ())); + flush outchan; (match prepend with | None -> () | Some text -> output_string outchan text; flush outchan); @@ -248,12 +271,15 @@ let callback (req: Http_types.request) outchan = | "/getdtd" -> Http_getter_cache.respond_dtd ~patch:(parse_patch req) ~url:(sprintf "%s/%s" - (Helm_registry.get "getter.dtd_dir") (req#param "uri")) + (Lazy.force Http_getter_env.dtd_dir) (req#param "uri")) outchan | "/resolve" -> return_resolve (req#param "uri") outchan | "/register" -> Http_getter.register ~uri:(req#param "uri") ~url:(req#param "url"); return_html_msg "Register done" outchan + | "/unregister" -> + Http_getter.unregister (req#param "uri"); + return_html_msg "Unregister done" outchan | "/clean_cache" -> Http_getter.clean_cache (); return_html_msg "Done." outchan @@ -294,13 +320,13 @@ let callback (req: Http_types.request) outchan = | Http_types.Param_not_found attr_name -> let msg = sprintf "Parameter '%s' is missing" attr_name in log_failure msg; - return_400 msg outchan + return_400 ("bad_request", msg) msg outchan | Bad_request msg -> log_failure msg; - return_html_error msg outchan + return_html_error ("bad_request", msg) msg outchan | Internal_error msg -> log_failure msg; - return_html_internal_error msg outchan + return_html_internal_error ("internal_error", msg) msg outchan | Shell.Subprocess_error l -> let msgs = List.map @@ -308,36 +334,46 @@ let callback (req: Http_types.request) outchan = sprintf "Command '%s' returned %s" cmd (string_of_proc_status code)) l in - log_failure (String.concat ", " msgs); - return_html_internal_error (String.concat "
\n" msgs) outchan - | exc -> - let msg = "Uncaught exception: " ^ (Printexc.to_string exc) in + let msg = String.concat ", " msgs in log_failure msg; - return_html_error msg outchan + return_html_internal_error ("subprocess_error", msg) + (String.concat "
\n" msgs) outchan + | exc -> + let msg = "uncaught exception: " ^ (Printexc.to_string exc) in + (match exc with + | Http_getter_types.Key_not_found uri -> + return_html_error ("key_not_found", uri) msg outchan + | _ -> + log_failure msg; + return_html_error ("uncaught_exception", msg) msg outchan) - (* Main *) +let batch_update = ref false +let args = [ + ("-update", + Arg.Unit (fun () -> batch_update := true), + "\tupdate maps and exit"); +] + + (* Main *) let main () = + Arg.parse args (fun _->()) "http_getter honors the following options:\n"; Helm_registry.load_from configuration_file; - Http_getter_logger.set_log_level - (Helm_registry.get_opt_default Helm_registry.get_int 1 "getter.log_level"); - Http_getter_logger.set_log_file - (Helm_registry.get_opt Helm_registry.get_string "getter.log_file"); - Http_getter_env.reload (); + Http_getter.init (); print_string (Http_getter_env.env_to_string ()); flush stdout; - let batch_update = - try Sys.argv.(1) = "-update" with Invalid_argument _ -> false - in - if batch_update then (* batch mode: performs update and exit *) + if !batch_update then (* batch mode: performs update and exit *) Http_getter.update ~logger:Http_getter.stdout_logger () else begin (* daemon mode: start http daemon *) at_exit Http_getter.close_maps; Sys.catch_break true; + let d_spec = Http_daemon.daemon_spec + ~mode:`Thread ~timeout:(Some 600) + ~port:(Lazy.force Http_getter_env.port) + ~callback:callback () + in try - Http_daemon.start' ~mode:`Thread - ~timeout:(Some 600) ~port:(Helm_registry.get_int "getter.port") - callback + Http_daemon.main d_spec with Sys.Break -> () (* 'close_maps' already registered with 'at_exit' *) end