simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 19:25:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

better logging, do not error on close

Browse source
This commit is contained in:
Simon Cruanes 2024-02-18 23:44:10 -05:00
parent 20a36919ce
commit 0d1bccfd1b
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Tiny_httpd_dir.ml
View file

@ -95,7 +95,7 @@ let vfs_of_dir (top : string) : vfs =
let read_file_content f = let read_file_content f =
let ic = Unix.(openfile (top // f) [ O_RDONLY ] 0) in let ic = Unix.(openfile (top // f) [ O_RDONLY ] 0) in
Tiny_httpd_stream.of_fd ic Tiny_httpd_stream.of_fd_close_noerr ic
let create f = let create f =
let oc = open_out_bin (top // f) in let oc = open_out_bin (top // f) in
@ -330,8 +330,12 @@ let add_vfs_ ~on_fs ~top ~config ~vfs:((module VFS : VFS) as vfs) ~prefix server
~headers:(mime_type @ [ "Etag", Lazy.force mtime ]) ~headers:(mime_type @ [ "Etag", Lazy.force mtime ])
~code:200 stream ~code:200 stream
with e -> with e ->
S.Response.fail ~code:500 "error while reading file: %s" let bt = Printexc.get_raw_backtrace () in
(Printexc.to_string e) let msg = Printexc.to_string e in
Log.error (fun k ->
k "dir.get failed: %s@.%s" msg
(Printexc.raw_backtrace_to_string bt));
S.Response.fail ~code:500 "error while reading file: %s" msg
)) ))
else else
S.add_route_handler server ~meth:`GET (route ()) (fun _ _ -> S.add_route_handler server ~meth:`GET (route ()) (fun _ _ ->