Skip to content

Commit e0c8c0c

Browse files
committed
[maintenance]: fix backtrace in xapi-database and drop Backtrace dependency
The backtrace wasn't retrieved before calling the logging function, so it was potentially lost. Use Printexc module instead. Signed-off-by: Edwin Török <edwin.torok@citrix.com>
1 parent 2c87b11 commit e0c8c0c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ocaml/database/dune

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
httpsvr
5454
unix
5555
uuid
56-
backtrace
5756
xapi-datamodel
5857
xapi-log
5958
(re_export xapi-schema)

ocaml/database/parse_db_conf.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,9 @@ let parse_db_conf s =
173173
sanity_check !connections ;
174174
!connections
175175
with exn ->
176+
let bt = Printexc.get_raw_backtrace () in
176177
error "Database config parse failed: %s" (Printexc.to_string exn) ;
177-
Backtrace.reraise exn Cannot_parse_database_config_file
178+
Printexc.raise_with_backtrace Cannot_parse_database_config_file bt
178179

179180
let get_db_conf path =
180181
if Sys.file_exists path then

0 commit comments

Comments
 (0)