- added some default values (no longer explicitely required in the

  configuration file)
- bugfix: read configuration values from the environment and not
  directly via Helm_registry

diff --git a/helm/http_getter/main.ml b/helm/http_getter/main.ml
index ed831c054b22c3db90c3f0e889f1159ca19648dd..1763836158eb1afd6c851bc0bea1789f1743361b 100644 (file)
--- a/helm/http_getter/main.ml
+++ b/helm/http_getter/main.ml
@@ -268,7 +268,7 @@ let callback (req: Http_types.request) outchan =
     | "/getdtd" ->
         Http_getter_cache.respond_dtd ~patch:(parse_patch req)
           ~url:(sprintf "%s/%s"
-            (Helm_registry.get "getter.dtd_dir") (req#param "uri"))
+            (Lazy.force Http_getter_env.dtd_dir) (req#param "uri"))
           outchan
     | "/resolve" -> return_resolve (req#param "uri") outchan
     | "/register" ->
@@ -348,11 +348,7 @@ let callback (req: Http_types.request) outchan =
 
 let main () =
   Helm_registry.load_from configuration_file;
-  Http_getter_logger.set_log_level
-    (Helm_registry.get_opt_default Helm_registry.get_int 1 "getter.log_level");
-  Http_getter_logger.set_log_file
-    (Helm_registry.get_opt Helm_registry.get_string "getter.log_file");
-  Http_getter_env.reload ();
+  Http_getter.init ();
   print_string (Http_getter_env.env_to_string ());
   flush stdout;
   let batch_update =
@@ -365,7 +361,7 @@ let main () =
     Sys.catch_break true;
     try
       Http_daemon.start' ~mode:`Thread
-        ~timeout:(Some 600) ~port:(Helm_registry.get_int "getter.port")
+        ~timeout:(Some 600) ~port:(Lazy.force Http_getter_env.port)
         callback
     with Sys.Break -> ()  (* 'close_maps' already registered with 'at_exit' *)
   end