## Copyright 2002-2004 Andrew Loewenstern, All Rights Reserved
# see LICENSE.txt for license information
+from twisted.python import log
+
from node import Node, NULL_ID
class KNodeBase(Node):
try:
senderid = dict['rsp']['id']
except KeyError:
- print ">>>> No peer id in response"
+ log.msg("No peer id in response")
raise Exception, "No peer id in response."
else:
if self.id != NULL_ID and senderid != self.id:
- print "Got response from different node than expected."
+ log.msg("Got response from different node than expected.")
self.table.invalidateNode(self)
return dict
def errBack(self, err):
- print ">>> ", err
+ log.err(err)
return err
def ping(self, id):
df.addCallback(self.checkSender)
return df
- def findNode(self, target, id):
+ def findNode(self, id, target):
df = self.conn.sendRequest('find_node', {"target" : target, "id": id})
df.addErrback(self.errBack)
df.addCallback(self.checkSender)
return df
class KNodeRead(KNodeBase):
- def findValue(self, key, id):
+ def findValue(self, id, key):
df = self.conn.sendRequest('find_value', {"key" : key, "id" : id})
df.addErrback(self.errBack)
df.addCallback(self.checkSender)
return df
+ def getValue(self, id, key, num):
+ df = self.conn.sendRequest('get_value', {"key" : key, "num": num, "id" : id})
+ df.addErrback(self.errBack)
+ df.addCallback(self.checkSender)
+ return df
+
class KNodeWrite(KNodeRead):
- def storeValue(self, key, value, originated, id):
- df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "originated" : originated, "id": id})
+ def storeValue(self, id, key, value, token):
+ df = self.conn.sendRequest('store_value', {"key" : key, "value" : value, "token" : token, "id": id})
df.addErrback(self.errBack)
df.addCallback(self.checkSender)
return df