Permalink
Browse files

[refactoring] Change the OMakefile to use the libraries moved in xen-…

…api-libs.hg

Signed-off-by: Thomas Gazagnaire <thomas.gazagnaire@citrix.com>
  • Loading branch information...
samoht committed Oct 26, 2009
1 parent 54821fe commit b73b216e3b58f71c126dfaab7d582293dc0cbdbe
Showing with 138 additions and 250 deletions.
  1. +1 −7 OMakefile
  2. +5 −19 ocaml/OMakefile
  3. +4 −4 ocaml/autogen/OMakefile
  4. +4 −4 ocaml/cvm/OMakefile
  5. +4 −7 ocaml/database/OMakefile
  6. +0 −1 ocaml/database/block_device_io.ml
  7. +1 −1 ocaml/database/db_cache.ml
  8. +3 −7 ocaml/db_process/OMakefile
  9. +3 −3 ocaml/events/OMakefile
  10. +4 −4 ocaml/graph/OMakefile
  11. +1 −1 ocaml/guest/OMakefile
  12. +3 −3 ocaml/guest_installer/OMakefile
  13. +4 −5 ocaml/idl/OMakefile
  14. +1 −1 ocaml/idl/js_backend/OMakefile
  15. +1 −2 ocaml/idl/lua/OMakefile
  16. +9 −15 ocaml/idl/ocaml_backend/OMakefile
  17. +3 −3 ocaml/in_guest_install/OMakefile
  18. +3 −15 ocaml/license/OMakefile
  19. +3 −3 ocaml/lvhdrt/OMakefile
  20. +3 −3 ocaml/mpathalert/OMakefile
  21. +3 −3 ocaml/multipathrt/OMakefile
  22. +4 −3 ocaml/p2v/OMakefile
  23. +2 −2 ocaml/p2v/p2v.ml
  24. +4 −4 ocaml/perftest/OMakefile
  25. +0 −2 ocaml/rfb/OMakefile
  26. +0 −4 ocaml/templates/OMakefile
  27. +4 −3 ocaml/toplevel/OMakefile
  28. +0 −21 ocaml/util/OMakefile
  29. +3 −4 ocaml/vncproxy/OMakefile
  30. +11 −18 ocaml/xapi/OMakefile
  31. +3 −5 ocaml/xapi/cli_operations.ml
  32. +2 −2 ocaml/xapi/db_gc.ml
  33. +1 −1 ocaml/xapi/events.ml
  34. +1 −1 ocaml/xapi/monitor.ml
  35. +1 −1 ocaml/xapi/pool_db_backup.ml
  36. +1 −1 ocaml/xapi/quicktest_encodings.ml
  37. +1 −1 ocaml/xapi/redo_log_alert.ml
  38. +1 −2 ocaml/xapi/xapi.ml
  39. +1 −1 ocaml/xapi/xapi_ha.ml
  40. +1 −1 ocaml/xapi/xapi_sr.ml
  41. +3 −3 ocaml/xapimon/OMakefile
  42. +5 −9 ocaml/xe-cli/OMakefile
  43. +3 −3 ocaml/xe-cli/rt/OMakefile
  44. +1 −3 ocaml/xe-cli/rt/testlog.ml
  45. +6 −6 ocaml/xenops-ts/OMakefile
  46. +4 −7 ocaml/xenops/OMakefile
  47. +0 −12 ocaml/xenops/squeezed.ml
  48. +3 −4 ocaml/xenstored/OMakefile
  49. +3 −3 ocaml/xiu/OMakefile
  50. +3 −3 ocaml/xsh/OMakefile
  51. +1 −3 ocaml/xsrpc/OMakefile
  52. +1 −1 ocaml/xstest/OMakefile
  53. +1 −5 ocaml/xva/OMakefile
View
@@ -24,7 +24,6 @@ if $(not $(defined-env CARBON_DISTFILES))
USE_OCAMLFIND = true
OCAMLFLAGS = -g -dtypes -thread -warn-error F
-OCAMLPACKS = threads bigarray
# c compiling stuff
OCAMLCFLAGS += -g
@@ -82,7 +81,7 @@ if $(not $(defined-env COMPILE_XENSTUFF))
.PHONY: none
# Ocaml #############################################################################
-OCAML_PHASE1= copy_quicktest_modules
+OCAML_PHASE1=
OCAML_PHASE2= autogen_idl
# JS ################################################################################
@@ -133,17 +132,12 @@ OCAML_PHASE3_NOXEN = \
ocaml/xe-cli/rt/xgetip \
ocaml/xe-cli/rt/geneva/cli_test \
ocaml/xe-cli/rt/geneva/sm_stress \
- ocaml/util/unix-domain-wrapper \
- ocaml/util/xmlpp \
ocaml/events/event_listen \
- ocaml/muxdemux/tar \
ocaml/console/console \
ocaml/graph/graph \
ocaml/rfb/rfb_randomtest \
ocaml/database/unit_test_marshall \
ocaml/database/block_device_io \
- ocaml/fdhelper/closeandexec \
- ocaml/fdhelper/closeandexec_static \
ocaml/toplevel \
ocaml/xiu/xiu \
ocaml/cdrommon/cdrommon \
View
@@ -1,18 +1,8 @@
# You must set your XEN_ROOT env var before building
-XEN_CFLAGS += -I$(XEN_ROOT)/usr/include
-OCAMLINCLUDES += $(ROOT)/ocaml/util
-
-OCAMLPACKS += stdext log
-
-OCAML_LIBS += \
- $(ROOT)/ocaml/util/version \
- $(ROOT)/ocaml/util/backtrace \
- $(ROOT)/ocaml/util/debug \
- $(ROOT)/ocaml/util/forkhelpers \
- $(ROOT)/ocaml/util/stunnel \
- $(ROOT)/ocaml/util/sha1sum \
- $(ROOT)/ocaml/util/gzip \
- $(ROOT)/ocaml/util/stats
+XEN_CFLAGS = -I$(XEN_ROOT)/usr/include
+OCAMLINCLUDES = +ocamldoc
+OCAML_LIBS = $(ROOT)/ocaml/util/version $(ROOT)/ocaml/util/stats
+OCAMLPACKS = stdext log
.SUBDIRS: \
autogen \
@@ -25,13 +15,10 @@ OCAML_LIBS += \
util \
xapi \
templates \
- http \
- sexpr \
xenguest \
xenops \
xenops-ts \
xsrpc \
- muxdemux \
xva \
guest \
console \
@@ -43,7 +30,6 @@ OCAML_LIBS += \
graph \
license \
rfb \
- fdhelper \
database \
toplevel \
xenstored \
@@ -59,4 +45,4 @@ OCAML_LIBS += \
mpathalert \
multipathrt \
doc
-
+
View
@@ -1,11 +1,11 @@
-OCAMLINCLUDES += ../sexpr ../idl/ocaml_backend ../database ../util ../http ../idl
-OCAMLPACKS += xmlm xml-light2
+AUTOGEN_HELPER_DIR = ../database
+
+OCAMLINCLUDES = ../idl/ocaml_backend $(AUTOGEN_HELPER_DIR) ../idl
+OCAMLPACKS = xml-light2 sexpr http-svr log
.PHONY: clean
clean:
rm -rf *.*
-AUTOGEN_HELPER_DIR = ../database
-
DB_ACTIONS_FILES = db_actions $(AUTOGEN_HELPER_DIR)/string_unmarshall_helper $(AUTOGEN_HELPER_DIR)/string_marshall_helper $(AUTOGEN_HELPER_DIR)/db_action_helper $(AUTOGEN_HELPER_DIR)/db_remote_marshall $(AUTOGEN_HELPER_DIR)/db_filter_types $(AUTOGEN_HELPER_DIR)/db_filter $(AUTOGEN_HELPER_DIR)/db_filter_parse $(AUTOGEN_HELPER_DIR)/db_filter_lex
OCamlProgram(db_actions, $(DB_ACTIONS_FILES))
OCamlDocProgram(db_actions, $(DB_ACTIONS_FILES))
View
@@ -1,8 +1,8 @@
-OCAML_LIBS += ../uuid/uuid ../idl/ocaml_backend/common ../log/log ../idl/ocaml_backend/client
-OCAMLINCLUDES += ../uuid ../idl ../idl/ocaml_backend/ ../autogen/ ../xva ../muxdemux ../log
-OCAMLPACKS += xmlm xml-light2
+OCAML_LIBS = ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend/
+OCAMLPACKS = stdext
-OCamlProgram(cvm, ../util/config cvm)
+OCamlProgram(cvm, cvm)
.PHONY: clean
clean:
View
@@ -1,10 +1,7 @@
-
-OCAMLINCLUDES += ../sexpr ../util ../idl/ocaml_backend ../xapi ../idl
-
-OCAMLPACKS += xmlm xml-light2 uuid
-OCAML_LIBS += ../sexpr/sexpr
-OCAMLPPFLAGS = -pp "camlp4o"
-OCAMLDEPFLAGS += -pp "camlp4o"
+OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../idl ../util
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log sexpr
+#OCAMLPPFLAGS = -pp "camlp4o"
+#OCAMLDEPFLAGS = -pp "camlp4o"
OCamlGeneratedFiles(db_filter_parse.ml db_filter_parse.mli db_filter_lex.ml)
@@ -119,7 +119,6 @@ exception NotEnoughSpace
(* Make informational output go to the syslog *)
let initialise_logging () =
- Debug.get_hostname := Helper_hostname.get_hostname;
List.iter
(fun level -> Logs.append "block_device_io" level "syslog:xapi_block_device_io")
[Log.Info; Log.Warn; Log.Error]
@@ -541,7 +541,7 @@ struct
(fun ()->
Db_connections.inc_db_flush_thread_refcount();
let db_path = dbconn.Parse_db_conf.path in
- name_thread ("dbflush ["^db_path^"]");
+ Debug.name_thread ("dbflush ["^db_path^"]");
let my_writes_this_period = ref 0 in
(* the collesce_period_start records the time of the last write *)
View
@@ -1,10 +1,6 @@
-OCAMLPACKS += unix xmlm xml-light2 uuid
-OCAML_LIBS += ../sexpr/sexpr ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../idl/ocaml_backend/server \
- ../util/backtrace ../util/sanitycheck ../util/sigutil ../util/encodings
-OCAMLINCLUDES += ../sexpr ../idl ../idl/ocaml_backend \
- ../autogen ../database/ \
- ../http/ ../xenops ../muxdemux ../xva \
- ../netdev ../auth ../license ../client_records ../rfb ../gpg ../xapi
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../util/stats ../idl/ocaml_backend/server
+OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../database
+OCAMLPACKS = xml-light2 uuid sexpr log stunnel http-svr
OCamlProgram(xapi-db-upgrade-4.2, xapi-db-upgrade-4.2)
OCamlProgram(xapi-db-process, xapi-db-process)
View
@@ -1,6 +1,6 @@
-OCAML_LIBS += ../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES = ../xapi ../idl/ocaml_backend ../autogen
-OCAMLPACKS = stdext xmlm xml-light2 uuid log
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend ../autogen
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
OCamlProgram(event_listen, event_listen)
View
@@ -1,8 +1,8 @@
-OCAML_LIBS += ../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES = ../xapi ../idl/ocaml_backend ../autogen ../idl
-OCAMLPACKS = stdext xmlm xml-light2 uuid log
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
-OCamlProgram(graph, graph ../idl/datamodel ../idl/datamodel_utils ../sexpr/sExpr ../sexpr/sExprLexer ../sexpr/sExprParser ../idl/dm_api)
+OCamlProgram(graph, graph ../idl/datamodel ../idl/datamodel_utils ../idl/dm_api)
.PHONY: clean
clean:
View
@@ -1,4 +1,4 @@
-OCAMLPACKS = stdext uuid xc mmap xb xs log
+OCAMLPACKS = stdext xc xs log
OCamlProgram(agent, agent)
@@ -1,6 +1,6 @@
-OCAML_LIBS += ../uuid/uuid ../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES += ../uuid ../idl/ocaml_backend/ ../autogen/ ../idl ../muxdemux ../xva
-OCAMLPACKS += xmlm xml-light2
+OCAML_LIBS = ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl
+OCAMLPACKS = xml-light2
section
OCamlProgram(xinstall, xinstall operations distros util ../idl/constants)
View
@@ -1,26 +1,25 @@
-
.SUBDIRS: ocaml_backend lua js_backend
JQUERY = $(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js
JQUERYTREEVIEWZIP = $(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip
PSTOPDF = $(shell bash -c "which pstopdf || which ps2pdf || which ps2pdf14")
-OCAMLINCLUDES += ocaml_backend ../database
-OCAMLPACKS += str xmlm xml-light2 uuid
+OCAMLINCLUDES = ocaml_backend ../database
+OCAMLPACKS = xml-light2 sexpr log
# -----------------------------------------------------------------------
# Build datamodel library
# -----------------------------------------------------------------------
-OCamlLibrary(datamodel, datamodel constants datamodel_utils datamodel_types api_errors api_messages dm_api ocaml_backend/ocaml_utils ../util/date ocaml_backend/ref ../database/string_marshall_helper ../sexpr/sExpr ../sexpr/sExprLexer ../sexpr/sExprParser)
+OCamlLibrary(datamodel, datamodel constants datamodel_utils datamodel_types api_errors api_messages dm_api ocaml_backend/ocaml_utils ocaml_backend/ref ../database/string_marshall_helper)
# -----------------------------------------------------------------------
# Build datamodel documentation
# -----------------------------------------------------------------------
DATAMODEL = datamodel
-DATAMODEL_FILES = constants datamodel_types api_errors api_messages dm_api datamodel datamodel_utils dtd_backend latex_backend dot_backend html_backend html_imagemap html_common html_main html_autogen html_types ../util/date ocaml_backend/xMLRPC ocaml_backend/ref ../database/string_marshall_helper ../util/encodings ../sexpr/sExpr ../sexpr/sExprLexer ../sexpr/sExprParser
+DATAMODEL_FILES = constants datamodel_types api_errors api_messages dm_api datamodel datamodel_utils dtd_backend latex_backend dot_backend html_backend html_imagemap html_common html_main html_autogen html_types ocaml_backend/xMLRPC ocaml_backend/ref ../database/string_marshall_helper
SHARED_TEX = coversheet.tex presentation.tex vm-lifecycle.tex wire-protocol.tex
SHARED_EPS = vm_lifecycle.eps
@@ -1,4 +1,4 @@
-OCAMLPACKS += xmlm xml-light2 unix str uuid
+OCAMLPACKS = xml-light2 uuid
# -----------------------------------------------------------------------
# autogen stuff
View
@@ -1,5 +1,4 @@
-
-OCAMLPACKS += xmlm xml-light2 unix str uuid
+OCAMLPACKS = xml-light2 uuid
# -----------------------------------------------------------------------
# autogen stuff
@@ -1,5 +1,4 @@
-
-OCAMLPACKS += xmlm xml-light2 unix
+OCAMLPACKS += xml-light2 stunnel
# -----------------------------------------------------------------------
# autogen stuff
@@ -10,15 +9,13 @@ OCAMLPACKS += xmlm xml-light2 unix
AUTOGEN_DIR = ../../autogen
AUTOGEN_HELPER_DIR = ../../database
-OCAMLINCLUDES += .. ../.. ../../database $(AUTOGEN_DIR) ../../http ../../sexpr ../../xapi ../../client_records
-
+OCAMLINCLUDES += .. ../.. ../../database $(AUTOGEN_DIR) ../../xapi ../../client_records
-OCAML_LIBS += ../../sexpr/sexpr
-OCAMLPACKS += stdext uuid
+OCAMLPACKS += sexpr http-svr
# only gen_api requires datamodel library:
-GEN_API_FILES = gen_api genOCaml ref ocaml_syntax gen_db_actions gen_db_check gen_empty_custom gen_client gen_server gen_common gen_rbac ../../database/escaping xMLRPC locking ../../util/date ../api_lowlevel
-OCamlProgram(gen_api_main, $(GEN_API_FILES) gen_api_main ../datamodel ../constants ../api_errors ../api_messages ../datamodel_utils ../datamodel_values ocaml_utils ../datamodel_types ../dm_api $(AUTOGEN_HELPER_DIR)/string_marshall_helper ../../util/encodings)
+GEN_API_FILES = gen_api genOCaml ref ocaml_syntax gen_db_actions gen_db_check gen_empty_custom gen_client gen_server gen_common gen_rbac ../../database/escaping xMLRPC locking ../api_lowlevel
+OCamlProgram(gen_api_main, $(GEN_API_FILES) gen_api_main ../datamodel ../constants ../api_errors ../api_messages ../datamodel_utils ../datamodel_values ocaml_utils ../datamodel_types ../dm_api $(AUTOGEN_HELPER_DIR)/string_marshall_helper)
FILTER = closed # or opensource or closed or debug or implementation
@@ -53,11 +50,10 @@ autogen_idl: $(AUTOGEN_DIR)/client.ml $(AUTOGEN_DIR)/aPI.ml $(AUTOGEN_DIR)/serve
# -----------------------------------------------------------------------
COMMON_OBJS = ref \
- ../datamodel_types ../../http/http ../../http/base64 xMLRPC event_types \
- ../../util/date ../../http/buf_io ../api_errors ../api_messages ../../xapi/xapi_globs \
+ ../datamodel_types xMLRPC event_types \
+ ../api_errors ../api_messages ../../xapi/xapi_globs \
../constants
-CLIENT_OBJS = xmlrpcclient ../../util/stunnel_cache \
- $(AUTOGEN_DIR)/aPI $(AUTOGEN_DIR)/client event_helper
+CLIENT_OBJS = xmlrpcclient $(AUTOGEN_DIR)/aPI $(AUTOGEN_DIR)/client event_helper
SERVER_OBJS = ../../database/escaping locking_helpers \
$(AUTOGEN_DIR)/server \
$(AUTOGEN_DIR)/db_actions $(AUTOGEN_DIR)/custom_actions \
@@ -92,13 +88,11 @@ SERVER_OBJS = ../../database/escaping locking_helpers \
../../xapi/parse_db_conf \
../../client_records/records \
../../client_records/record_util \
- ../../util/encodings \
../../util/vm_memory_constraints \
locking ../dm_api \
../datamodel ../datamodel_utils ../datamodel_values \
gen_client ocaml_syntax ocaml_utils taskHelper exnHelper \
- server_helpers session_check context ../../util/config \
- ../../http/http_svr ../../util/server_io \
+ server_helpers session_check context \
../../xapi/pool_role \
../../xapi/xapi_inventory \
../../xapi/hashtbl_xml \
@@ -1,6 +1,6 @@
-OCAML_LIBS += ../uuid/uuid ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../mmap/mmap ../xc/xc ../xb/xb ../xs/xs ../netdev/netdev ../xenops/xenops
-OCAMLINCLUDES += ../xapi ../idl/ocaml_backend ../autogen ../idl ../xs ../netdev ../xenops
-OCAMLPACKS += unix,stdext,xmlm,xml-light2
+OCAML_LIBS = ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../netdev/netdev ../xenops/xenops
+OCAMLINCLUDES = ../idl/ocaml_backend ../autogen ../idl ../netdev ../xenops
+OCAMLPACKS = unix stdext xml-light2
OCAMLFLAGS += -dtypes -warn-error F -cclib -static
View
@@ -1,22 +1,10 @@
-OCAMLINCLUDES += \
- $(ROOT)/ocaml/util \
- $(ROOT)/ocaml/http \
- $(ROOT)/ocaml/idl/ocaml_backend \
- $(ROOT)/ocaml/idl \
- $(ROOT)/ocaml/http \
- $(ROOT)/ocaml/autogen \
- $(ROOT)/ocaml/gpg \
- $(ROOT)/ocaml/xapi
-
-OCAMLPACKS+=xmlm,xml-light2,stdext,uuid,str,mmap,xb,xs
-OCAML_LIBS+=$(ROOT)/ocaml/idl/ocaml_backend/common $(ROOT)/ocaml/idl/ocaml_backend/client
-
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen ../xapi ../gpg ../util
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
IEXE=install -m 755 -o root -g root
V6FILES = \
- ../util/server_io \
- ../http/http_svr \
../xapi/xapi_inventory \
v6alert \
fakev6 \
View
@@ -1,6 +1,6 @@
-OCAML_LIBS+=../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES += ../idl/ocaml_backend/ ../autogen/ ../idl ../muxdemux ../xva ../util ../http ../xapi
-OCAMLPACKS+=xmlm,xml-light2,stdext,uuid,str
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
IEXE=install -m 755 -o root -g root
@@ -1,6 +1,6 @@
-OCAML_LIBS+=../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES += ../idl/ocaml_backend/ ../autogen/ ../idl ../muxdemux ../xva ../util ../http ../xapi
-OCAMLPACKS+=xmlm,xml-light2,stdext,uuid,str
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
OCamlProgram(mpathalert, mpathalert)
@@ -1,6 +1,6 @@
-OCAML_LIBS+=../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES += ../idl/ocaml_backend/ ../autogen/ ../idl ../muxdemux ../xva ../util ../http ../xapi ../client_records
-OCAMLPACKS+=xmlm,xml-light2,stdext,uuid,str
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen ../client_records
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log
IEXE=install -m 755 -o root -g root
View
@@ -1,6 +1,7 @@
-OCAMLINCLUDES += ../xapi ../idl/ocaml_backend ../autogen ../idl ../netdev ../xenops ../http
-OCAMLPACKS = unix,stdext,xmlm,xml-light2,log,uuid,mmap,xc,xb,xs
-OCAML_LIBS += ../idl/ocaml_backend/common ../sexpr/sexpr ../idl/ocaml_backend/client ../netdev/netdev ../xenops/xenops ../idl/ocaml_backend/server
+OCAML_LIBS = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
+OCAMLINCLUDES = ../idl/ocaml_backend ../idl ../autogen ../xapi
+OCAMLPACKS = xml-light2 stdext stunnel http-svr log xs
+
OCAMLFLAGS += -dtypes -warn-error F -cclib -static -cclib -lpthread -g
View
@@ -344,7 +344,7 @@ let exn_to_http sock fn =
try fn ()
with
| Api_errors.Server_error(code, params) as e -> begin
- debug "exn_to_http: API Error:%s %s" (Api_errors.to_string e) (ExnHelper.string_of_exn e);
+ debug "exn_to_http: API Error:%s %s" (Api_errors.to_string e) (Printexc.to_string e);
Http.output_http sock Http.http_500_internal_error;
ignore (unix_really_write sock ("\r\nAPI Error: "^Api_errors.to_string e))
end
@@ -354,7 +354,7 @@ let exn_to_http sock fn =
ignore (unix_really_write sock ("\r\nServer error: "^e))
end
| exn -> begin
- debug "exn_to_http: general: %s" (ExnHelper.string_of_exn exn);
+ debug "exn_to_http: general: %s" (Printexc.to_string exn);
Http.output_http sock Http.http_500_internal_error;
end
Oops, something went wrong.

0 comments on commit b73b216

Please sign in to comment.