From 5a9d89ed42ddcd209d001a10d7eb828ef0e6d9de Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Tue, 26 Mar 2019 23:50:37 -0400 Subject: [PATCH] patches (#582) * selfdrive: add sys module to exit call exit() is a helper for interactive shell. Let's explicit use the module sys. * selfdrive: tomstoned.py use constant for /data/tombstones/ Instead of use multiple times a string for the data dir, use a variable. --- selfdrive/debug/dump.py | 2 +- selfdrive/tombstoned.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/debug/dump.py b/selfdrive/debug/dump.py index 92b10cadca..45b737953f 100755 --- a/selfdrive/debug/dump.py +++ b/selfdrive/debug/dump.py @@ -39,7 +39,7 @@ if __name__ == "__main__": port = int(m) else: print("service not found") - exit(-1) + sys.exit(-1) sock = messaging.sub_sock(context, port, poller, addr=args.addr) if args.proxy: republish_socks[sock] = messaging.pub_sock(context, port) diff --git a/selfdrive/tombstoned.py b/selfdrive/tombstoned.py index bac43a0a19..c76294e6c5 100644 --- a/selfdrive/tombstoned.py +++ b/selfdrive/tombstoned.py @@ -11,8 +11,9 @@ from selfdrive.version import version, dirty from selfdrive.swaglog import cloudlog def get_tombstones(): - return [("/data/tombstones/"+fn, int(os.stat("/data/tombstones/"+fn).st_ctime) ) - for fn in os.listdir("/data/tombstones") if fn.startswith("tombstone")] + DIR_DATA = "/data/tombstones/" + return [(DIR_DATA + fn, int(os.stat(DIR_DATA + fn).st_ctime) ) + for fn in os.listdir(DIR_DATA) if fn.startswith("tombstone")] def report_tombstone(fn, client): mtime = os.path.getmtime(fn)