mirrors
/
faiss
mirror of https://github.com/facebookresearch/faiss.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix RPC lib logging (#2433) 

Summary:
I couldn't run the client-server implementation because of the logging. Indeed `LOG.info('Connected by', addr, end=' ')` raised an exception (`end` is not recognised as a valid argument).

Other warnings are also showing up. This PR clean things up a bit and fixes the client-server.

Pull Request resolved: https://github.com/facebookresearch/faiss/pull/2433

Reviewed By: alexanderguzhva

Differential Revision: D39167576

Pulled By: mdouze

fbshipit-source-id: 6f74d582f14e353e04029e6465bd6e488a865289
pull/2458/head
François Travais 2022-09-08 01:05:52 -07:00 committed by Facebook GitHub Bot
parent c04088cf3d
commit b74ac352d3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/rpc.py
View File

@ -133,7 +133,7 @@ class Server:
f=getattr(self,fname)
except AttributeError:
st = AttributeError("unknown method "+fname)
self.log("unknown method ")
self.log("unknown method")
try:
ret = f(*args)
@ -203,7 +203,7 @@ class Client:
socktype = socket.AF_INET6 if v6 else socket.AF_INET
sock = socket.socket(socktype, socket.SOCK_STREAM)
LOG.info("connecting", HOST, port, socktype)
LOG.info("connecting to %s:%d, socket type: %s", HOST, port, socktype)
sock.connect((HOST, port))
self.sock = sock
self.fs = FileSock(sock)
@ -231,13 +231,13 @@ def run_server(new_handler, port=PORT, report_to_file=None, v6=False):
s = socket.socket(socktype, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
LOG.info("bind %s:%d" % (HOST, port))
LOG.info("bind %s:%d", HOST, port)
s.bind((HOST, port))
s.listen(5)
LOG.info("accepting connections")
if report_to_file is not None:
LOG.info('storing host+port in', report_to_file)
LOG.info('storing host+port in %s', report_to_file)
open(report_to_file, 'w').write('%s:%d ' % (socket.gethostname(), port))
while True:
@ -247,10 +247,10 @@ def run_server(new_handler, port=PORT, report_to_file=None, v6=False):
if e[1]=='Interrupted system call': continue
raise
LOG.info('Connected by', addr, end=' ')
LOG.info('Connected to %s', addr)
ibs = new_handler(conn)
tid = _thread.start_new_thread(ibs.exec_loop,())
LOG.info("tid",tid)
LOG.debug("Thread ID: %d", tid)