Skip to content

Commit

Permalink
Rename sockaddrs -> addresses
Browse files Browse the repository at this point in the history
  • Loading branch information
mhinz committed Nov 25, 2019
1 parent df70322 commit e7e001a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions nvr/nvr.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,23 +355,23 @@ def split_cmds_from_files(args):
return cmds, files


def print_sockaddrs():
sockaddrs = []
def print_addresses():
addresses = []

for proc in psutil.process_iter(attrs=['name']):
if proc.info['name'] == 'nvim':
try:
for conn in proc.connections('inet4'):
sockaddrs.insert(0, ':'.join(map(str, conn.laddr)))
addresses.insert(0, ':'.join(map(str, conn.laddr)))
for conn in proc.connections('inet6'):
sockaddrs.insert(0, ':'.join(map(str, conn.laddr)))
addresses.insert(0, ':'.join(map(str, conn.laddr)))
for conn in proc.connections('unix'):
if conn.laddr:
sockaddrs.insert(0, conn.laddr)
addresses.insert(0, conn.laddr)
except psutil.AccessDenied:
sockaddrs.insert(0, 'Access denied for nvim ({})'.format(proc.pid))
addresses.insert(0, 'Access denied for nvim ({})'.format(proc.pid))

for addr in sorted(sockaddrs):
for addr in sorted(addresses):
print(addr)


Expand All @@ -395,7 +395,7 @@ def main(argv=sys.argv, env=os.environ):
return

if options.serverlist:
print_sockaddrs()
print_addresses()
return

address = options.servername or env.get('NVIM_LISTEN_ADDRESS') or '/tmp/nvimsocket'
Expand Down

0 comments on commit e7e001a

Please sign in to comment.