From f3d725e58d3832188c377e1ebe750195dcf8b4c8 Mon Sep 17 00:00:00 2001
From: Vehicle Researcher <user@comma.ai>
Date: Mon, 30 Jan 2017 14:10:01 -0800
Subject: [PATCH] openpilot v0.2.5 release

old-commit-hash: 29c58b45882ac79595356caf98580c1d2a626011
---
 RELEASES.md                | 4 ++++
 selfdrive/common/version.h | 2 +-
 selfdrive/manager.py       | 8 +-------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index 91166d1797..d46eed30e8 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,3 +1,7 @@
+Version 0.2.5  (2017-01-30)
+===========================
+  * Fix race condition in manager
+
 Version 0.2.4  (2017-01-27)
 ===========================
   * OnePlus 3T support
diff --git a/selfdrive/common/version.h b/selfdrive/common/version.h
index 11b08e1f78..c94c6cfec1 100644
--- a/selfdrive/common/version.h
+++ b/selfdrive/common/version.h
@@ -1 +1 @@
-const char *openpilot_version = "0.2.4";
+const char *openpilot_version = "0.2.5";
diff --git a/selfdrive/manager.py b/selfdrive/manager.py
index ab3729454a..2bcb729ac8 100755
--- a/selfdrive/manager.py
+++ b/selfdrive/manager.py
@@ -18,7 +18,6 @@ from selfdrive.swaglog import cloudlog
 import selfdrive.messaging as messaging
 from selfdrive.thermal import read_thermal
 from selfdrive.registration import register
-from selfdrive.loggerd.uploader import Uploader
 
 import common.crash
 
@@ -132,7 +131,7 @@ def cleanup_all_processes(signal, frame):
 # ****************** run loop ******************
 
 def manager_init():
-  global gctx, fake_uploader
+  global gctx
 
   reg_res = register()
   if reg_res:
@@ -148,8 +147,6 @@ def manager_init():
   cloudlog.bind_global(dongle_id=dongle_id)
   common.crash.bind_user(dongle_id=dongle_id)
 
-  fake_uploader = Uploader(dongle_id, dongle_secret, ROOT)
-
   # set gctx
   gctx = {
     "calibration": {
@@ -251,10 +248,7 @@ def manager_thread():
 
     # report to server once per minute
     if (count%60) == 0:
-      names, total_size = fake_uploader.get_data_stats()
       cloudlog.event("STATUS_PACKET",
-        names=names,
-        total_size=total_size,
         running=running.keys(),
         count=count,
         health=(td.to_dict() if td else None),