From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Mon, 16 Feb 2004 22:50:06 +0000 (+0000)
Subject: Porting of uriSetQueue to Helm_registry.
X-Git-Tag: v0_0_4~182
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=c3bcf78cacffb2c3f76895ba033de2b834763163;p=helm.git

Porting of uriSetQueue to Helm_registry.
---

diff --git a/helm/graphs/tools/Makefile b/helm/graphs/tools/Makefile
index 1d945f8fd..072667031 100644
--- a/helm/graphs/tools/Makefile
+++ b/helm/graphs/tools/Makefile
@@ -3,7 +3,7 @@ DOT=dot
 #SED=sed "s/font-family:Times;//g"
 SED=cat
 
-REQUIRES = http
+REQUIRES = http helm-registry
 PREDICATES = mt
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
diff --git a/helm/graphs/tools/uriSetQueue.conf.xml.sample b/helm/graphs/tools/uriSetQueue.conf.xml.sample
new file mode 100644
index 000000000..9bfc3d859
--- /dev/null
+++ b/helm/graphs/tools/uriSetQueue.conf.xml.sample
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<helm_registry>
+  <section name="uriSetQueue">
+    <key name="port">58082</key>
+  </section>
+</helm_registry>
diff --git a/helm/graphs/tools/uriSetQueue.ml b/helm/graphs/tools/uriSetQueue.ml
index 12b7e91c0..77d15dcad 100644
--- a/helm/graphs/tools/uriSetQueue.ml
+++ b/helm/graphs/tools/uriSetQueue.ml
@@ -29,9 +29,8 @@ Http_common.debug := debug;;
 
 open Printf;;
 
+let configuration_file = "/projects/helm/etc/uriSetQueue.conf.xml";;
 let daemon_name = "Uri Set Queue";;
-let default_port = 48082;;
-let port_env_var = "URI_SET_QUEUE_PORT";;
 
 module OrderedUri: Set.OrderedType with type t = string =
   struct
@@ -77,15 +76,6 @@ let queue_mem item queue =  (* mem function over queues *)
   with Found -> true
 ;;
 
-let port =
-  try
-    int_of_string (Sys.getenv port_env_var)
-  with
-  | Not_found -> default_port
-  | Failure "int_of_string" ->
-      prerr_endline "Warning: invalid port, reverting to default";
-      default_port
-in
 let callback (req: Http_types.request) outchan =
   try
     let res = new Http_response.response () in
@@ -191,6 +181,8 @@ let callback (req: Http_types.request) outchan =
         outchan
 in
 
+Helm_registry.load_from configuration_file;
+let port = Helm_registry.get_int "uri_set_queue.port" in
 printf "%s started and listening on port %d\n" daemon_name port;
 flush stdout;
 Http_daemon.start' ~port ~mode:`Thread callback;