X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=djbdns%2Fio.py;h=75422c01387032f0a0aab6e87e8f40fac411d010;hb=c965f2fea1788a7faba2c67a4f05c27d5c34373b;hp=7c70bab3debcf2b78ad43e18146488740cdf1c4e;hpb=d0b0eaf76d414da4b32313db94c1e38f29c0da60;p=djbdns-logparse.git

diff --git a/djbdns/io.py b/djbdns/io.py
index 7c70bab..75422c0 100644
--- a/djbdns/io.py
+++ b/djbdns/io.py
@@ -31,19 +31,26 @@ def parse_logfile(file : TextIO):
     # Open a pipe to tai64nlocal. We'll write lines of our input file
     # (the log file) to it, and read back the same lines but with
     # friendly timestamps in them.
-    tai = Popen(["tai64nlocal"], stdin=PIPE, stdout=PIPE, text=True, bufsize=0)
+    with Popen(["tai64nlocal"],
+               stdin=PIPE,
+               stdout=PIPE,
+               text=True,
+               bufsize=0) as tai:
 
-    for line in file:
-        tai.stdin.write(line)
-        line = tai.stdout.readline()
+        for line in file:
+            tai.stdin.write(line)
+            line = tai.stdout.readline()
 
-        friendly_line = handle_tinydns_log(line)
-        if not friendly_line:
-            friendly_line = handle_dnscache_log(line)
+            friendly_line = handle_tinydns_log(line)
             if not friendly_line:
-                friendly_line = line
-
-        print(friendly_line)
-
-    # Ensure that the pipe gets closed.
-    tai.communicate()
+                friendly_line = handle_dnscache_log(line)
+                if not friendly_line:
+                    friendly_line = line
+
+            try:
+                print(friendly_line)
+            except BrokenPipeError:
+                # If our stdout is being piped to another process and if
+                # that process closes the pipe, this error will be raised
+                # the next time we try to write to stdout.
+                break