Merge pull request #173 from basho/bugfix/sdc/gh158-2.0-backport

Handle case where advanced.config contains > 1 terms

Reviewed-by: seancribbs

Author: borshop

src/cuttlefish_escript.erl

@@ -372,8 +372,11 @@ engage_cuttlefish(ParsedArgs) ->
             case file:consult(AdvancedConfigFile) of
                 {ok, [AdvancedConfig]} ->
                     cuttlefish_advanced:overlay(NewConfig, AdvancedConfig);
+                {ok, OtherTerms} ->
+                    lager:error("Error parsing ~s, incorrect format: ~p", [AdvancedConfigFile, OtherTerms]),
+                    stop_deactivate();
                 {error, Error} ->
-                    lager:error("Error parsing advanced.config: ~s", [file:format_error(Error)]),
+                    lager:error("Error parsing ~s: ~s", [AdvancedConfigFile, file:format_error(Error)]),
                     stop_deactivate()
             end;
         _ ->

test/cuttlefish_escript_integration_tests.erl

@@ -17,6 +17,18 @@ escript_utf8_test() ->
     ok.
 
 
+advanced_config_format_test() ->
+    cuttlefish_lager_test_backend:bounce(error),
+    ?assertThrow(stop_deactivate, cuttlefish_escript:main(
+                                    "-d ../test_fixtures/acformat/generated.config "
+                                    "-s ../test_fixtures/acformat/lib "
+                                    "-e ../test_fixtures/acformat/etc "
+                                    "-c ../test_fixtures/acformat/etc/acformat.conf generate"
+                                   )),
+    [Log] = cuttlefish_lager_test_backend:get_logs(),
+    ?assertMatch({match, _}, re:run(Log, "Error parsing [.][.]/test_fixtures/acformat/etc/advanced.config, incorrect format: \\[\\[a\\],\\[b\\]\\]")),
+    ok.
+
 escript_prune_test_() ->
     {timeout, 20, [
                    escript_prune("-m 3", 3),

test_fixtures/acformat/etc/acformat.conf

@@ -0,0 +1 @@
+setting = thing

test_fixtures/acformat/etc/advanced.config

@@ -0,0 +1,2 @@
+[a].
+[b].

test_fixtures/acformat/lib/01-setting.schema

@@ -0,0 +1 @@
+{mapping, "setting", "setting", []}.