From 62cdd857b5090dda3c559eebb047873cc8020091 Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Aug 22 2017 22:15:26 +0000 Subject: Add timeout to commands --- diff --git a/fpaste b/fpaste index a398e93..985aae5 100755 --- a/fpaste +++ b/fpaste @@ -236,7 +236,11 @@ def sysinfo( shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (out, err) = p.communicate() + try: + (out, err) = p.communicate(timeout=300) + except subprocess.TimeoutExpired: + p.kill() + (out, err) = p.communicate() if not p.returncode == 0: if show_stderr: if err: