Allow comments in flavors

Summary: allow comments in mcrouter flavors. Test Plan: mcrouter unit tests Reviewed By: @int Differential Revision: D2040484
radford · May 12, 2015 · d711b1c · d711b1c
1 parent ec9b092
commit d711b1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/mcrouter/flavor.cpp b/mcrouter/flavor.cpp
@@ -66,7 +66,7 @@ bool readLibmcrouterFlavor(
     const std::string& flavor_json,
     std::unordered_map<std::string, std::string>& opts) {
   try {
-    auto json = parseJsonString(flavor_json);
+    auto json = parseJsonString(folly::json::stripComments(flavor_json));
     return parse_json_options(json, "options", opts);
   } catch (...) {
     return false;
@@ -88,7 +88,8 @@ bool readStandaloneFlavor(
     std::unordered_map<std::string, std::string>& standalone_opts,
     std::unordered_map<std::string, std::string>& libmcrouter_opts) {
   try {
-    auto json = parseJsonString(standalone_flavor_json);
+    auto json = parseJsonString(
+      folly::json::stripComments(standalone_flavor_json));
 
     if (!parse_json_options(json, "standalone_options", standalone_opts)) {
       return false;

diff --git a/mcrouter/test/cpp_unit_tests/flavor_test.cpp b/mcrouter/test/cpp_unit_tests/flavor_test.cpp
@@ -32,7 +32,7 @@ TEST(Flavor, readStandaloneFlavor) {
   std::string flavorContents =
     "{"
       "\"libmcrouter_options\": {"
-        "\"default_route\": \"abc\""
+        "\"default_route\": \"abc\" /* comment */"
       "},"
       "\"standalone_options\": {"
         "\"port\": \"11001\", "
@@ -99,7 +99,7 @@ TEST(Flavor, readFlavorFromTwoFiles) {
   std::string flavorStandaloneContents =
     "{"
       "\"standalone_options\": {"
-        "\"port\": \"11001\", "
+        "\"port\": \"11001\", /* comment */"
         "\"log_file\": \"mcrouter.log\""
       "}"
     "}";
@@ -164,6 +164,7 @@ TEST(Flavor, readFlavorFromTwoFilesShouldOverrideLibmcrouterOptions) {
   std::string flavorContents =
     "{"
       "\"options\": {"
+        "// comment\n"
         "\"default_route\": \"abc\""
       "}"
     "}";