Merge pull request #211 from heroku/control-rod-drain-forwarding

control rod to stop drain forwarding
heroku · Jan 12, 2018 · ee72a91 · ee72a91
2 parents 1aa63e4 + 620e618
commit ee72a91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/logplex_app.erl b/src/logplex_app.erl
@@ -147,6 +147,9 @@ cache_os_envvars() ->
                      ,{disable_redgrid, ["DISABLE_REDGRID"],
                        optional,
                        atom}
+                     ,{disable_drain_forwarding, ["DISABLE_DRAIN_FORWARDING"],
+                       optional,
+                       atom}
                      ]),
     ok.
 

diff --git a/src/logplex_message.erl b/src/logplex_message.erl
@@ -78,7 +78,7 @@ process_msg(RawMsg, ChannelId, Token, TokenName, ShardInfo)
         Flag ->
             CookedMsg = iolist_to_binary(re:replace(RawMsg, Token, TokenName)),
             logplex_firehose:post_msg(ChannelId, TokenName, RawMsg),
-            process_drains(ChannelId, CookedMsg),
+            process_drains(ChannelId, CookedMsg, logplex_app:config(deny_drain_forwarding, false)),
             process_tails(ChannelId, CookedMsg),
             process_redis(ChannelId, ShardInfo, CookedMsg, logplex_app:config(deny_redis_buffers, Flag))
     end.
@@ -118,7 +118,9 @@ do_process_error({false, _HerokuOrigin}, _ChannelID, _Origin, Fmt, Args) ->
           [channel_id, ErrMsg]),
     ignored.
 
-process_drains(ChannelID, Msg) ->
+process_drains(ChannelID, Msg, true) ->
+    ok;
+process_drains(ChannelID, Msg, false) ->
     logplex_channel:post_msg({channel, ChannelID}, Msg).
 
 process_tails(ChannelId, Msg) ->