future

kong/clustering/rpc/future.lua

@@ -16,34 +16,35 @@ function _M.new(node_id, socket, method, params, is_notification)
   local self = {
     method = method,
     params = params,
-    sema = semaphore.new(),
     socket = socket,
     node_id = node_id,
-    id = nil,
-    result = nil,
-    error = nil,
-    state = STATE_NEW, -- STATE_*
     is_notification = is_notification,
   }
 
+  if not is_notification then
+    self.id = nil
+    self.result = nil
+    self.error = nil
+    self.state = STATE_NEW -- STATE_*
+    self.sema = semaphore.new()
+  end
+
   return setmetatable(self, _MT)
 end
 
 
 -- start executing the future
 function _M:start()
-  assert(self.state == STATE_NEW)
-  self.state = STATE_IN_PROGRESS
-
   -- notification has no callback
   if self.is_notification then
-    self.state = STATE_SUCCEED
-
     return self.socket:call(self.node_id,
                             self.method,
                             self.params)
   end
 
+  assert(self.state == STATE_NEW)
+  self.state = STATE_IN_PROGRESS
+
   local callback = function(resp)
     assert(resp.jsonrpc == jsonrpc.VERSION)
 
@@ -70,6 +71,7 @@ end
 
 
 function _M:wait(timeout)
+  assert(not self.is_notification)
   assert(self.state == STATE_IN_PROGRESS)
 
   local res, err = self.sema:wait(timeout)