Skip to content

Commit 30cdd2e

Browse files
committed
Merge branch 'dynlink-already-loaded' into remove-lwt-logs
2 parents 71b6f9d + 11532a6 commit 30cdd2e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/baselib/ocsigen_loader.ml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ let loadfile pre post force file =
8585
addloaded file)
8686
else
8787
Logs.info ~src:section (fun fmt -> fmt "Extension %s already loaded" file)
88-
with e -> raise (Dynlink_error (file, e))
88+
with
89+
| Dynlink.Error (Dynlink.Module_already_loaded m) ->
90+
Logs.info ~src:section (fun fmt ->
91+
fmt "While loading extension %s: Module %s cannot be loaded again" file
92+
m)
93+
| e -> raise (Dynlink_error (file, e))
8994

9095
let id () = ()
9196

0 commit comments

Comments
 (0)