Skip to content

Commit

Permalink
Add Eliom.run function to run Eliom without config file
Browse files Browse the repository at this point in the history
and update to last version of Ocsigen Server
  • Loading branch information
balat committed May 4, 2024
1 parent 769267d commit 9cdc739
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions src/lib/eliom.server.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
let run ?site () =
Ocsigen_server.Site.register ?site Eliom_registration.instruction
15 changes: 7 additions & 8 deletions src/lib/eliom_registration.server.ml
Original file line number Diff line number Diff line change
Expand Up @@ -1261,13 +1261,12 @@ let set_exn_handler h =
Eliom_request_info.set_site_handler sitedata
(Result_types.cast_function_http h)

let extension =
Ocsigen_server.Site.create_extension_intrusive (fun vh conf_info site_dir ->
let sitedata = Eliommod.create_sitedata vh site_dir conf_info in
Eliom_common.absolute_change_sitedata sitedata;
(* CHECKME *)
Eliom_common.begin_load_eliom_module ();
Eliommod.site_init (ref true);
fun _ -> Eliommod_pagegen.gen None sitedata)
let instruction vh conf_info site_dir =
let sitedata = Eliommod.create_sitedata vh site_dir conf_info in
Eliom_common.absolute_change_sitedata sitedata;
(* CHECKME *)
Eliom_common.begin_load_eliom_module ();
Eliommod.site_init (ref true);
Eliommod_pagegen.gen None sitedata

let end_init = Eliom_common.end_load_eliom_module
2 changes: 1 addition & 1 deletion src/lib/eliom_registration.server.mli
Original file line number Diff line number Diff line change
Expand Up @@ -488,5 +488,5 @@ val cast_http_result : Ocsigen_response.t -> 'a kind
(** [cast_http_result] should only be used to register new output
modules *)

val extension : Ocsigen_server.Site.extension
val instruction : Ocsigen_server.Site.instruction
val end_init : unit -> unit
1 change: 1 addition & 0 deletions src/lib/server/dune.server
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
(rule (copy# ../eliom.server.ml eliom.ml))
(rule (copy# ../eliom_bus.server.ml eliom_bus.ml))
(rule (copy# ../eliom_bus.server.mli eliom_bus.mli))
(rule (copy# ../eliom_client.server.ml eliom_client.ml))
Expand Down

0 comments on commit 9cdc739

Please sign in to comment.