diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-02-12 03:59:02 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-02-12 03:59:02 +0700 |
| commit | 668e7e3ef3d31666b053a8d7cd7c01d7c853c053 (patch) | |
| tree | 992fddb212f119733ccc330e1d2832d269191801 /src | |
| parent | cab7d1cddaace91d0bb4230ffe5c80e42a8df4b4 (diff) | |
| download | vyconf-668e7e3ef3d31666b053a8d7cd7c01d7c853c053.tar.gz vyconf-668e7e3ef3d31666b053a8d7cd7c01d7c853c053.zip | |
Revert "Fix build with new Toml module version."
Seems lenses are back.
This reverts commit 8938e627c04c01f8f30a854be6903a9abcd2fa5b.
Diffstat (limited to 'src')
| -rw-r--r-- | src/vyconf_config.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vyconf_config.ml b/src/vyconf_config.ml index b7d1352..7a87c1a 100644 --- a/src/vyconf_config.ml +++ b/src/vyconf_config.ml @@ -34,9 +34,10 @@ let empty_config = { (* XXX: We assume that nesting in TOML config files never goes beyond two levels *) let get_field conf tbl_name field_name = - try - Some (Toml.get_string (Toml.key field_name) (Toml.get_table (Toml.key tbl_name) conf)) - with Not_found -> None + (* NB: TomlLenses module uses "table" and "field" names for function names, + hence tbl_name and field_name + *) + TomlLenses.(get conf (key tbl_name |-- table |-- key field_name |-- string)) let mandatory_field conf table field = let value = get_field conf table field in @@ -51,7 +52,7 @@ let optional_field default conf table field = let load filename = try let open Defaults in - let conf_toml = Toml.Parser.from_filename filename in + let conf_toml = Toml.Parser.from_filename filename |> Toml.Parser.unsafe in let conf = empty_config in (* Mandatory fields *) let conf = {conf with app_name = mandatory_field conf_toml "appliance" "name"} in |