diff options
| author | Daniil Baturin <daniil@baturin.org> | 2017-12-12 21:07:25 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2017-12-12 21:07:25 +0000 |
| commit | 8f2ff161343548a7d735808c203f0582fcb91145 (patch) | |
| tree | 90e8045adbd5cd9630ac84f7770e5ff96ae85774 | |
| parent | 02708b5fc0daa6dbcab6a12128663878c31da352 (diff) | |
| download | vyconf-8f2ff161343548a7d735808c203f0582fcb91145.tar.gz vyconf-8f2ff161343548a7d735808c203f0582fcb91145.zip | |
Rename the Startup.load_config to load_daemon_config to avoid ambiguity with the appliance config.
| -rw-r--r-- | src/startup.ml | 2 | ||||
| -rw-r--r-- | src/startup.mli | 2 | ||||
| -rw-r--r-- | src/vyconfd.ml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/startup.ml b/src/startup.ml index 8e1cd9a..c6e2f8c 100644 --- a/src/startup.ml +++ b/src/startup.ml @@ -29,7 +29,7 @@ let setup_logger daemonize log_file template = Lwt_log.default := l; Lwt.return_unit (** Load the config file or panic if it fails *) -let load_config path = +let load_daemon_config path = let result = Vyconf_config.load path in match result with | Ok cfg -> cfg diff --git a/src/startup.mli b/src/startup.mli index 988e028..219d5a9 100644 --- a/src/startup.mli +++ b/src/startup.mli @@ -2,7 +2,7 @@ val panic : string -> 'a val setup_logger : bool -> string option -> Lwt_log.template -> unit Lwt.t -val load_config : string -> Vyconf_config.t +val load_daemon_config : string -> Vyconf_config.t val check_dirs : Directories.t -> unit diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 4058a5b..16802fd 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -144,7 +144,7 @@ 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_config !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 Startup.check_dirs dirs; |