[tor-commits] [sbws/master] Exit on OSError when building circuit

pastly at torproject.org pastly at torproject.org
Wed Sep 5 19:44:55 UTC 2018


commit 949e67637772597621a6060673270a6df1ecdec4
Author: juga0 <juga at riseup.net>
Date:   Sun Jul 15 14:28:13 2018 +0000

    Exit on OSError when building circuit
---
 sbws/core/scanner.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 4e59498..0fe7908 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -198,7 +198,16 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
     our_nick = conf['scanner']['nickname']
     circ_id = cb.build_circuit(circ_fps)
     if not circ_id:
-        log.warning('Could not build circuit involving %s', relay.nickname)
+        try:
+            log.warning('Could not build circuit involving %s', relay.nickname)
+        except OSError as e:
+            # if the error is no space left (logging to file system)
+            # can not log the error, so print it
+            # this can happen in any log call, here would happen when measuring
+            # new relay starts
+            if e.code == 28:  # No space left on device
+                print("ERROR: " + str(e))
+                exit(1)
         msg = 'Unable to complete circuit'
         return [
             ResultErrorCircuit(relay, circ_fps, dest.url, our_nick, msg=msg),





More information about the tor-commits mailing list