Merge branch 'v35' into v36

heroku · Feb 13, 2012 · 0342acc · 0342acc
2 parents ab34325 + 0ffd500
commit 0342acc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/tcp_proxy.erl b/src/tcp_proxy.erl
@@ -118,7 +118,7 @@ handle_info({tcp_error, Sock, Reason},
             State = #state{sock = Sock,
                            peername = {H,P}}) ->
     ?WARN("err=gen_tcp peer=~s data=~p duration=~s",
-          [loglex_logging:dest(H,P), Reason, duration(State)]),
+          [logplex_logging:dest(H,P), Reason, duration(State)]),
     {stop, normal, State};
 
 handle_info(Msg, State) ->

diff --git a/upgrades/v32_v33/live_upgrade.erl b/upgrades/v32_v33/live_upgrade.erl
@@ -24,7 +24,7 @@ UpgradeNode = fun () ->
 
   %% logplex_shard_info stuff
   l(logplex_channel),
-  l(loglex_worker),
+  l(logplex_worker),
 
   Pid = whereis(logplex_shard),
 
@@ -41,4 +41,4 @@ UpgradeNode = fun () ->
 
   io:format(whereis(user), "at=upgrade_end~n", []),
   gen_server:call(Pid, consistency_check)
-end.
+end.