Commit d5a99bb8 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Fix so that the monitor no longer squawk when a non-blocking call returns EWOULDBLOCK.

parent f6f8761a
......@@ -13,6 +13,7 @@ import socket
import select
import re
import traceback
import errno
from optparse import OptionParser
sys.path.append("/usr/testbed/lib")
from tbevent import EventClient, address_tuple, ADDRESSTUPLE_ALL
......@@ -660,8 +661,13 @@ def send_command(conn, key, command_id, command):
+ key
+ command)
send_buffer = send_buffer + output
sent = conn.send(send_buffer, socket.MSG_DONTWAIT)
send_buffer = send_buffer[sent:]
try:
sent = conn.send(send_buffer, socket.MSG_DONTWAIT)
send_buffer = send_buffer[sent:]
except socket.error, inst:
num = inst[0]
if num != errno.EWOULDBLOCK:
raise
##########################################################################
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment