Skip to content

No longer run initialization code within Lwt_main.run #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2019
Merged

No longer run initialization code within Lwt_main.run #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions src/server/ocsigen_server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,24 +1217,28 @@ let start_server () =
in
let run (user, group) (_, ports, sslports) (minthreads, maxthreads) s =

Ocsigen_messages.open_files ~user ~group () >>= fun () ->

let wait_end_init, wait_end_init_awakener = wait () in
(* Listening on all ports: *)

Lwt_list.fold_left_s
(fun a i ->
listen false i wait_end_init >>= fun l ->
Lwt.return (l @ a))
[] ports >>= fun l ->
sockets := l;

Lwt_list.fold_left_s
(fun a i ->
listen true i wait_end_init >>= fun l ->
Lwt.return (l @ a))
[] sslports >>= fun l ->
sslsockets := l;
let () =
Lwt_main.run
(Ocsigen_messages.open_files ~user ~group () >>= fun () ->

Lwt_list.fold_left_s
(fun a i ->
listen false i wait_end_init >>= fun l ->
Lwt.return (l @ a))
[] ports >>= fun l ->
sockets := l;

Lwt_list.fold_left_s
(fun a i ->
listen true i wait_end_init >>= fun l ->
Lwt.return (l @ a))
[] sslports >>= fun l ->
sslsockets := l;
Lwt.return_unit)
in

begin match ports with
| (_, p)::_ -> Ocsigen_config.set_default_port p
Expand Down Expand Up @@ -1385,7 +1389,7 @@ let start_server () =
Lwt_log.ign_notice ~section "Ocsigen has been launched \
(initialisations ok)";

fst (Lwt.wait ())
Lwt_main.run @@ fst (Lwt.wait ())

in

Expand Down Expand Up @@ -1466,15 +1470,15 @@ let start_server () =
let pid = Lwt_unix.fork () in
if pid = 0
then
Lwt_main.run (run user_info sslinfo threadinfo h)
run user_info sslinfo threadinfo h
else begin
Ocsigen_messages.console
(fun () -> "Process "^(string_of_int pid)^" detached");
write_pid pid
end
else begin
write_pid (Unix.getpid ());
Lwt_main.run (run user_info sslinfo threadinfo h)
run user_info sslinfo threadinfo h
end
| _ -> () (* Multiple servers not supported any more *)

Expand Down