Merge pull request #118 from xhtmlboi/revert-116-server-error

Revert "Show detailed diagnostics for 500 server errors"

Author: xhtmlboi

CHANGES.md

@@ -84,12 +84,10 @@
 
 #### Yocaml_unix
 
-- Improve rendering of 500 error pages on server (by [Linda-Njau](https://github.com/Linda-Njau))
 - Adapt runtime to `is_file` (by [xvw](https://xvw.lol))
 
 #### Yocaml_eio
 
-- Improve rendering of 500 error pages on server (by [Linda-Njau](https://github.com/Linda-Njau))
 - Adapt runtime to `is_file` (by [xvw](https://xvw.lol))
 
 #### Yocaml_git

lib/core/runtime.ml

@@ -22,7 +22,7 @@ module Make (Runtime : Required.RUNTIME) = struct
            ~in_exception_handler:true)
         exn
     in
-    msg |> Runtime.log `Error |> Runtime.bind (fun () -> raise exn)
+    msg |> Runtime.log `Error |> Runtime.bind (fun () -> raise Exit)
 
   let runtimec error =
     let error = Runtime.runtime_error_to_string error in

lib/runtime/server.ml

@@ -107,12 +107,6 @@ module Pages = struct
       |> String.concat ""
     in
     Format.asprintf "<nav><h1>%s</h1></nav><ul>%s</ul>" top listing
-
-  let error500 msg =
-    Format.asprintf
-      "<h1>500 Internal server error</h1><hr /><p>The build failed while \
-       refreshing the site.</p><pre>%s</pre>"
-      msg
 end
 
 let prompt port =

lib/runtime/server.mli

@@ -54,7 +54,6 @@ module Pages : sig
 
   val error404 : string -> string
   val directory : string list -> Kind.t list -> string
-  val error500 : string -> string
 end
 
 (** {1 Helpers} *)

plugins/yocaml_eio/server.ml

@@ -60,22 +60,11 @@ let dir path lpath =
     render_html @@ Yocaml_runtime.Server.Pages.directory lpath children
 
 let handler htdoc refresh _socket request _body =
-  try
-    refresh ();
-    match get_requested_uri htdoc request with
-    | Error404 -> error404 htdoc
-    | File (path, str) -> file path str
-    | Dir (path, lpath) -> dir path lpath
-  with exn ->
-    let msg =
-      Format.asprintf "%a"
-        (fun ppf exn ->
-          Yocaml.Diagnostic.exception_to_diagnostic ~in_exception_handler:true
-            ppf exn)
-        exn
-    in
-    render_html ~status:`Internal_server_error
-      (Yocaml_runtime.Server.Pages.error500 msg)
+  let () = refresh () in
+  match get_requested_uri htdoc request with
+  | Error404 -> error404 htdoc
+  | File (path, str) -> file path str
+  | Dir (path, lpath) -> dir path lpath
 
 let run ?custom_error_handler directory port program env =
   Eio.Switch.run (fun sw ->

plugins/yocaml_unix/server.ml

@@ -82,22 +82,11 @@ let dir reqd path lpath =
 
 let[@warning "-8"] handler htdoc refresh _socket
     (`V1 reqd : Httpcats.Server.reqd) =
-  try
-    refresh ();
-    match get_requested_uri htdoc reqd with
-    | Error404 -> error404 reqd htdoc
-    | File (path, _) -> file reqd path
-    | Dir (path, lpath) -> dir reqd path lpath
-  with exn ->
-    let msg =
-      Format.asprintf "%a"
-        (fun ppf exn ->
-          Yocaml.Diagnostic.exception_to_diagnostic ~in_exception_handler:true
-            ppf exn)
-        exn
-    in
-    render_html ~status:`Internal_server_error reqd
-      (Yocaml_runtime.Server.Pages.error500 msg)
+  let () = refresh () in
+  match get_requested_uri htdoc reqd with
+  | Error404 -> error404 reqd htdoc
+  | File (path, _) -> file reqd path
+  | Dir (path, lpath) -> dir reqd path lpath
 
 let run ?custom_error_handler directory port program =
   let refresh () = Runner.run ?custom_error_handler program in

test/e2e/bin/dune

@@ -29,25 +29,3 @@
   yocaml_jingoo
   yocaml_cmarkit
   yocaml_markdown))
-
-(executable
- (name unix_server_error)
- (modules server_error unix_server_error test_article)
- (libraries
-  yocaml
-  yocaml_unix
-  yocaml_yaml
-  yocaml_jingoo
-  yocaml_cmarkit
-  yocaml_markdown))
-
-(executable
- (name eio_server_error)
- (modules server_error eio_server_error test_article)
- (libraries
-  yocaml
-  yocaml_eio
-  yocaml_yaml
-  yocaml_jingoo
-  yocaml_cmarkit
-  yocaml_markdown))