fix crash when http endpoint is missing

mondemand · Sep 19, 2016 · 44520b9 · 44520b9
1 parent 81281a4
commit 44520b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Version 6.4.1 (molinaro)
+  * don't crash if http trace endpoint is not set
+
 Version 6.4.0 (molinaro)
   * now able to post traces over 65kb
   * updated the version of lwes dependency

diff --git a/src/mondemand.app.src b/src/mondemand.app.src
@@ -1,7 +1,7 @@
 { application, mondemand,
   [
    { description, "Erlang Mondemand Bindings." },
-   { vsn, "6.4.0" },
+   { vsn, "6.4.1" },
    { modules, [] },
    { registered, [mondemand,mondemand_sup]},
    { applications, [kernel,stdlib,syntax_tools,lwes,inets]},

diff --git a/src/mondemand_config.erl b/src/mondemand_config.erl
@@ -259,10 +259,14 @@ get_http_config () ->
         {ok, File} ->
           case file:read_file (File) of
             {ok, Bin} ->
-              {match, [TraceEndPoint]} =
-                 re:run (Bin, "MONDEMAND_HTTP_ENDPOINT_TRACE=\"([^\"]+)\"",
-                              [{capture, all_but_first, list}]),
-              [{trace, TraceEndPoint}];
+              case re:run (Bin,
+                           "MONDEMAND_TRACE_HTTP_ENDPOINT=\"([^\"]+)\"",
+                           [{capture, all_but_first, list}]) of
+                {match, [TraceEndPoint]} ->
+                  [{trace, TraceEndPoint}];
+                _ ->
+                  {error, no_http_configured}
+              end;
             E ->
               E
           end;