proxy: keep merged usage in ctx and self

Otherwise, in some cases Proxy reports the usage associated with the service mapping rules instead of the merged one.
3scale · Feb 7, 2018 · e38066c · e38066c
1 parent 0c3aeb4
commit e38066c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gateway/src/apicast/proxy.lua b/gateway/src/apicast/proxy.lua
@@ -296,11 +296,11 @@ function _M:rewrite(service, context)
   context.usage = context.usage or Usage.new()
   context.usage:merge(usage)
 
-  ctx.usage = usage
+  ctx.usage = context.usage
   ctx.credentials = credentials
 
   self.credentials = credentials
-  self.usage = usage
+  self.usage = context.usage
 
   var.cached_key = concat(cached_key, ':')