Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit d9e81ab

Browse files
committed
Bug fix to get_cases
1 parent 61f915c commit d9e81ab

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

api/restapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ def get_cases(self, request):
13251325
"vendor": case[7],
13261326
"validation": json.loads(case[8]),
13271327
"status": "closed" if case[10] == 1 else "open",
1328-
"unread": case[9]
1328+
"unread": case[11]
13291329
}
13301330
cases_list.append(purchase_json)
13311331
request.setHeader('content-type', "application/json")

db/datastore.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ def delete_messages(self, guid):
672672
cursor = conn.cursor()
673673
cursor.execute('''DELETE FROM messages WHERE guid=? AND messageType="CHAT"''', (guid, ))
674674
conn.commit()
675+
conn.close()
675676

676677

677678
class NotificationStore(object):

dht/protocol.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def handleCallResponse(self, result, node):
228228
"""
229229
if result[0]:
230230
if self.isNewConnection(node) and node.id not in self.recent_transfers:
231-
if len(self.recent_transfers) == 10:
231+
for i in range(len(self.recent_transfers) - 10):
232232
self.recent_transfers.pop()
233233
self.recent_transfers.add(node.id)
234234
self.log.debug("call response from new node, transferring key/values")
@@ -246,7 +246,7 @@ def addToRouter(self, node):
246246
if they are new and within our neighborhood.
247247
"""
248248
if self.isNewConnection(node) and node.id not in self.recent_transfers:
249-
if len(self.recent_transfers) == 10:
249+
for i in range(len(self.recent_transfers) - 10):
250250
self.recent_transfers.pop()
251251
self.recent_transfers.add(node.id)
252252
self.log.debug("found a new node, transferring key/values")

net/rpcudp.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def receive_message(self, message, sender, connection, ban_score):
5050
connection.shutdown()
5151
return False
5252

53-
self.multiplexer.vendors[sender.id] = sender
53+
if sender.vendor:
54+
self.multiplexer.vendors[sender.id] = sender
5455

5556
msgID = message.messageID
5657
if message.command == NOT_FOUND:
@@ -60,10 +61,9 @@ def receive_message(self, message, sender, connection, ban_score):
6061
if msgID in self._outstanding:
6162
self._acceptResponse(msgID, data, sender)
6263
elif message.command != NOT_FOUND:
63-
ban_score.process_message(connection.dest_addr, message)
64+
#ban_score.process_message(connection.dest_addr, message)
6465
self._acceptRequest(msgID, str(Command.Name(message.command)).lower(), data, sender, connection)
65-
else:
66-
ban_score.process_message(connection.dest_addr, message)
66+
#else: ban_score.process_message(connection.dest_addr, message)
6767

6868
def _acceptResponse(self, msgID, data, sender):
6969
if data is not None:

net/wireprotocol.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ def on_connection_made(self):
7777
if self.connection.state == State.CONNECTED:
7878
self.addr = str(self.connection.dest_addr[0]) + ":" + str(self.connection.dest_addr[1])
7979
self.log.info("connected to %s" % self.addr)
80-
self.ban_score.process_message(self.connection.dest_addr, 100)
80+
#self.ban_score.process_message(self.connection.dest_addr, 100)
8181

8282
def receive_message(self, datagram):
8383
if len(datagram) < 166:
8484
self.log.warning("received datagram too small from %s, ignoring" % self.addr)
85-
self.ban_score.process_message(self.connection.dest_addr, 110)
85+
#self.ban_score.process_message(self.connection.dest_addr, 110)
8686
return False
8787
try:
8888
m = Message()
@@ -109,7 +109,7 @@ def receive_message(self, datagram):
109109
except Exception:
110110
# If message isn't formatted property then ignore
111111
self.log.warning("received an invalid message from %s, ignoring" % self.addr)
112-
self.ban_score.process_message(self.connection.dest_addr, 110)
112+
#self.ban_score.process_message(self.connection.dest_addr, 110)
113113
return False
114114

115115
def handle_shutdown(self):

0 commit comments

Comments
 (0)