[tor-commits] [stem/master] Give a useful error if our pid lookup fails

[atagar at torproject.org]

commit e53d1bfbfa3e11f11d247610c518bc8fd8c64730
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Feb 17 08:56:00 2015 -0800

    Give a useful error if our pid lookup fails
    
    pid_by_name() returns None if the lookup fails, so moving it earlier so we
    raise an exception when that happens. Also a misspelling.
---
 stem/util/connection.py |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/stem/util/connection.py b/stem/util/connection.py
index e5abaa8..fa2a3d5 100644
--- a/stem/util/connection.py
+++ b/stem/util/connection.py
@@ -119,7 +119,6 @@ RESOLVER_FILTER = {
   Resolver.NETSTAT: '^{protocol}\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}/{name}\s*$',
 
   # tcp        586 192.168.0.1:44284       38.229.79.2:443         ESTABLISHED 15843
-
   Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$',
 
   # tcp    ESTAB      0      0           192.168.0.20:44415       38.229.79.2:443    users:(("tor",15843,9))
@@ -180,7 +179,10 @@ def get_connections(resolver, process_pid = None, process_name = None):
     except ValueError:
       raise ValueError('Process pid was non-numeric: %s' % process_pid)
 
-  if process_pid is None and resolver in (Resolver.PROC, Resolver.BSD_PROCSTAT):
+  if process_pid is None and process_name and resolver == Resolver.NETSTAT_WINDOWS:
+    process_pid = stem.util.system.pid_by_name(process_name)
+
+  if process_pid is None and resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT):
     raise ValueError('%s resolution requires a pid' % resolver)
 
   if resolver == Resolver.PROC:
@@ -188,11 +190,6 @@ def get_connections(resolver, process_pid = None, process_name = None):
 
   resolver_command = RESOLVER_COMMAND[resolver].format(pid = process_pid)
 
-  # In case, process_name is only specified
-  if resolver == Resolver.NETSTAT_WINDOWS:
-    if not process_pid and process_name:
-      process_pid = stem.util.system.pid_by_name(process_name)
-
   try:
     results = stem.util.system.call(resolver_command)
   except OSError as exc:
@@ -273,7 +270,7 @@ def system_resolvers(system = None):
   elif system in ('Darwin', 'OpenBSD'):
     resolvers = [Resolver.LSOF]
   elif system == 'FreeBSD':
-    # Netstat is available, but lacks a '-p' equivilant so we can't associate
+    # Netstat is available, but lacks a '-p' equivalent so we can't associate
     # the results to processes. The platform also has a ss command, but it
     # belongs to a spreadsheet application.