diff options
| author | Daniil Baturin <daniil@baturin.org> | 2017-12-12 22:21:02 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2017-12-12 22:21:02 +0000 |
| commit | 5f7d6a60287bac8f633b9c4e5e9e3f6f3a45da85 (patch) | |
| tree | a60da9092db67505858322047be22ded98cf730b /src/vyconfd.ml | |
| parent | 8f2ff161343548a7d735808c203f0582fcb91145 (diff) | |
| download | vyconf-5f7d6a60287bac8f633b9c4e5e9e3f6f3a45da85.tar.gz vyconf-5f7d6a60287bac8f633b9c4e5e9e3f6f3a45da85.zip | |
Add config load upon startup.
Diffstat (limited to 'src/vyconfd.ml')
| -rw-r--r-- | src/vyconfd.ml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 16802fd..2670588 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -144,10 +144,14 @@ let make_world config dirs = let () = let () = Arg.parse args (fun f -> ()) usage in let () = config_file := FP.concat !basepath !config_file in - let config = Startup.load_daemon_config !config_file in - let () = Lwt_log.load_rules ("* -> " ^ config.log_level) in - let dirs = Directories.make !basepath config in + let vc = Startup.load_daemon_config !config_file in + let () = Lwt_log.load_rules ("* -> " ^ vc.log_level) in + let dirs = Directories.make !basepath vc in Startup.check_dirs dirs; - let world = make_world config dirs in + let world = make_world vc dirs in + let config = Startup.load_config_failsafe + (FP.concat vc.config_dir vc.primary_config) + (FP.concat vc.config_dir vc.fallback_config) in + let world = Session.{world with running_config=config} in Lwt_main.run @@ main_loop !basepath world () |