open Http_getter_common
open Http_getter_misc
open Http_getter_types
-open Http_getter_debugger
(* constants *)
-let configuration_file = "/projects/helm/etc/http_getter.conf.xml"
+let configuration_file = BuildTimeOpts.conffile
let common_headers = [
"Cache-Control", "no-cache";
(* HTTP queries argument parsing *)
- (* parse encoding ("format" parameter), default is Enc_normal *)
+ (* parse encoding ("format" parameter), default is `Normal *)
let parse_enc (req: Http_types.request) =
try
(match req#param "format" with
- | "normal" -> Enc_normal
- | "gz" -> Enc_gzipped
+ | "normal" -> `Normal
+ | "gz" -> `Gzipped
| s -> raise (Bad_request ("Invalid format: " ^ s)))
- with Http_types.Param_not_found _ -> Enc_normal
+ with Http_types.Param_not_found _ -> `Normal
(* parse "patch_dtd" parameter, default is true *)
let parse_patch (req: Http_types.request) =
with Http_types.Param_not_found _ -> true
(* parse output format ("format" parameter), no default value *)
-let parse_output_format (req: Http_types.request) =
+let parse_output_format meth (req: Http_types.request) =
match req#param "format" with
- | s when String.lowercase s = "txt" -> Fmt_text
- | s when String.lowercase s = "xml" -> Fmt_xml
- | s -> raise (Bad_request ("Invalid /ls format: " ^ s))
+ | s when String.lowercase s = "txt" -> `Text
+ | s when String.lowercase s = "xml" -> `Xml
+ | s -> raise (Bad_request ("Invalid /" ^ meth ^ " format: " ^ s))
(* parse "baseuri" format for /ls method, no default value *)
let parse_ls_uri =
| "backward" -> `Backward
| c -> raise (Bad_request ("Invalid RDF class: " ^ c))
+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 "<html><body>Http Getter error: <span style=\"color:red\">%s</span></body></html>" s
+let pp_internal_error s =
+ sprintf "<html><body>Http Getter Internal error: <span style=\"color:red\">%s</span></body></html>" s
+let pp_msg s = sprintf "<html><body>%s</body></html>" 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_xml_raw = mk_return_fun null_pp "text/xml"
+let return_400 body outchan = Http_daemon.respond_error ~code:400 ~body outchan
+
let return_all_foo_uris doctype uris outchan =
Http_daemon.send_basic_headers ~code:200 outchan;
Http_daemon.send_header "Content-Type" "text/xml" outchan;
uris;
output_string outchan (sprintf "</%s>\n" doctype)
-let return_all_xml_uris outchan =
- return_all_foo_uris "alluris" (Http_getter.getalluris ()) outchan
+let return_all_xml_uris fmt outchan =
+ let uris = Http_getter.getalluris () in
+ match fmt with
+ | `Text ->
+ let buf = Buffer.create 10240 in
+ List.iter (bprintf buf "%s\n") uris ;
+ let body = Buffer.contents buf in
+ Http_daemon.respond
+ ~headers:(("Content-Type", "text/plain") :: common_headers)
+ ~body outchan
+ | `Xml ->
+ return_all_foo_uris "alluris" uris outchan
+
let return_all_rdf_uris classs outchan =
return_all_foo_uris "allrdfuris" (Http_getter.getallrdfuris classs) outchan
let ls_items = Http_getter.ls xmluri in
let buf = Buffer.create 10240 in
(match fmt with
- | Fmt_text ->
+ | `Text ->
List.iter
(function
| Ls_section dir -> bprintf buf "dir, %s\n" dir
(string_of_ls_flag obj.body)
(string_of_ls_flag obj.proof_tree))
ls_items
- | Fmt_xml ->
+ | `Xml ->
Buffer.add_string buf "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
bprintf buf "<!DOCTYPE ls SYSTEM \"%s/getdtd?uri=ls.dtd\">\n"
(Lazy.force Http_getter_env.my_own_url);
(Http_getter.list_servers ()))))
outchan
+let log_failure msg = Http_getter_logger.log ("Request not fulfilled: " ^ msg)
+
+ (** given an action (i.e. a function which expects a logger and do something
+ * using it as a logger), perform it sending its output incrementally to the
+ * given output channel. Response is sent embedded in an HTML document.
+ * Channel is closed afterwards. *)
+let send_log_to ?prepend action outchan =
+ Http_daemon.send_basic_headers ~code:200 outchan;
+ Http_daemon.send_header "Content-Type" "text/html" outchan;
+ Http_daemon.send_CRLF outchan;
+ output_string outchan "<html><body>\n"; flush outchan;
+ (match prepend with
+ | None -> ()
+ | Some text -> output_string outchan text; flush outchan);
+ let logger tag =
+ output_string outchan (HelmLogger.html_of_html_tag tag);
+ flush outchan
+ in
+ action logger;
+ output_string outchan "\n</body></html>";
+ close_out outchan
+
(* thread action *)
let callback (req: Http_types.request) outchan =
try
- debug_print ("Connection from " ^ req#clientAddr);
- debug_print ("Received request: " ^ req#path);
+ Http_getter_logger.log ("Connection from " ^ req#clientAddr);
+ Http_getter_logger.log ("Received request: " ^ req#path);
(match req#path with
| "/help" -> return_help outchan
| "/getxml" ->
return_html_msg "Done." outchan
| "/update" ->
Http_getter_env.reload (); (* reload servers list from servers file *)
- let log = Http_getter.update () in
- return_html_msg (HelmLogger.html_of_html_msg log) outchan
+ send_log_to (fun logger -> Http_getter.update ~logger ()) outchan
| "/list_servers" -> return_list_servers outchan
| "/add_server" ->
let name = req#param "url" in
let position = parse_position req in
- let log = Http_getter.add_server ~position name in
- return_html_msg
- (sprintf "Added server %s in position %d)<br />\n%s"
- name position (HelmLogger.html_of_html_msg log))
- outchan
+ let prepend =
+ sprintf "Added server %s in position %d)<br />\n" name position
+ in
+ send_log_to ~prepend
+ (fun logger -> Http_getter.add_server ~logger ~position name) outchan
| "/remove_server" ->
let position = parse_position req in
- let log =
- try
- Http_getter.remove_server position
- with Invalid_argument _ ->
- raise (Bad_request (sprintf "no server with position %d" position))
- in
- return_html_msg
- (sprintf "Removed server at position %d<br />\n%s"
- position (HelmLogger.html_of_html_msg log))
- outchan
- | "/getalluris" -> return_all_xml_uris outchan
+ if not (Http_getter.has_server position) then
+ raise (Bad_request (sprintf "no server with position %d" position))
+ else
+ let prepend =
+ sprintf "Removed server at position %d<br />\n" position
+ in
+ send_log_to ~prepend
+ (fun logger -> Http_getter.remove_server ~logger position) outchan
+ | "/getalluris" ->
+ return_all_xml_uris (parse_output_format "getalluris" req) outchan
| "/getallrdfuris" -> return_all_rdf_uris (parse_rdf_class req) outchan
- | "/ls" -> return_ls (parse_ls_uri req) (parse_output_format req) outchan
+ | "/ls" ->
+ return_ls (parse_ls_uri req) (parse_output_format "ls" req) outchan
| "/getempty" ->
Http_daemon.respond ~body:Http_getter_const.empty_xml outchan
| invalid_request ->
Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan);
- debug_print "Done!\n"
+ Http_getter_logger.log "Done!\n"
with
| Http_types.Param_not_found attr_name ->
- return_400 (sprintf "Parameter '%s' is missing" attr_name) outchan
- | Bad_request msg -> return_html_error msg outchan
- | Internal_error msg -> return_html_internal_error msg outchan
+ let msg = sprintf "Parameter '%s' is missing" attr_name in
+ log_failure msg;
+ return_400 msg outchan
+ | Bad_request msg ->
+ log_failure msg;
+ return_html_error msg outchan
+ | Internal_error msg ->
+ log_failure msg;
+ return_html_internal_error msg outchan
| Shell.Subprocess_error l ->
- return_html_internal_error
- (String.concat "<br />\n"
- (List.map
- (fun (cmd, code) ->
- sprintf "Command '%s' returned %s"
- cmd (string_of_proc_status code))
- l))
- outchan
+ let msgs =
+ List.map
+ (fun (cmd, code) ->
+ sprintf "Command '%s' returned %s" cmd (string_of_proc_status code))
+ l
+ in
+ log_failure (String.concat ", " msgs);
+ return_html_internal_error (String.concat "<br />\n" msgs) outchan
| exc ->
- return_html_error
- ("Uncaught exception: " ^ (Printexc.to_string exc))
- outchan
+ let msg = "Uncaught exception: " ^ (Printexc.to_string exc) in
+ log_failure msg;
+ return_html_error msg outchan
(* Main *)
let main () =
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 ();
print_string (Http_getter_env.env_to_string ());
flush stdout;
- at_exit Http_getter.close_maps;
- Sys.catch_break true;
- try
- Http_daemon.start' ~mode:`Thread
- ~timeout:(Some 600) ~port:(Helm_registry.get_int "getter.port")
- callback
- with Sys.Break -> () (* 'close_maps' already registered with 'at_exit' *)
+ let batch_update =
+ try Sys.argv.(1) = "-update" with Invalid_argument _ -> false
+ in
+ 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;
+ try
+ Http_daemon.start' ~mode:`Thread
+ ~timeout:(Some 600) ~port:(Helm_registry.get_int "getter.port")
+ callback
+ with Sys.Break -> () (* 'close_maps' already registered with 'at_exit' *)
+ end
let _ = main ()
projects / helm.git / blobdiff