fixing slow execution

zabuldon · Sep 18, 2017 · 3274d78 · 3274d78
1 parent 3130f73
commit 3274d78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 setup(
     name='teslajsonpy',
-    version='0.0.12',
+    version='0.0.13',
     packages=['teslajsonpy'],
     include_package_data=True,
     license='WTFPL',

diff --git a/teslajsonpy/connection.py b/teslajsonpy/connection.py
@@ -58,7 +58,7 @@ def __open(self, url, headers={}, data=None, baseurl=""):
         except TypeError:
             pass
         opener = build_opener()
-        self.logger.error(req.full_url)
+        self.logger.debug(req.full_url)
         while True:
             try:
                 resp = opener.open(req)

diff --git a/teslajsonpy/controller.py b/teslajsonpy/controller.py
@@ -22,10 +22,8 @@ def __init__(self, email, password, update_interval, logger):
         self.__last_update_time = {}
         self.__logger = logger
         cars = self.__connection.get('vehicles')['response']
-        self.debug_msg('Found cars: {}'.format(dumps(cars)))
         for car in cars:
             self.__last_update_time[car['id']] = 0
-            self.debug_msg('Initializing car with ID: {}'.format(car['id']))
             self.update(car['id'])
             self.__vehicles.append(Climate(car, self))
             self.__vehicles.append(Battery(car, self))
@@ -36,17 +34,12 @@ def __init__(self, email, password, update_interval, logger):
             self.__vehicles.append(ParkingSensor(car, self))
             self.__vehicles.append(GPS(car, self))
 
-    def debug_msg(self, msg):
-        if self.__logger:
-            print(msg)
-            self.__logger.debug(msg)
-
     def post(self, vehicle_id, command, data={}):
-        self.debug_msg('vehicles/%i/%s' % (vehicle_id, command))
+        self.__logger.debug('vehicles/%i/%s' % (vehicle_id, command))
         return self.__connection.post('vehicles/%i/%s' % (vehicle_id, command), data)
 
     def get(self, vehicle_id, command):
-        self.debug_msg('vehicles/%i/%s' % (vehicle_id, command))
+        self.__logger.debug('vehicles/%i/%s' % (vehicle_id, command))
         return self.__connection.get('vehicles/%i/%s' % (vehicle_id, command))
 
     def data_request(self, vehicle_id, name):
@@ -59,7 +52,7 @@ def list_vehicles(self):
         return self.__vehicles
 
     def wake_up(self, vehicle_id):
-        self.debug_msg('{} {}'.format(vehicle_id, 'wake_up'))
+        self.__logger.debug('{} {}'.format(vehicle_id, 'wake_up'))
         self.post(vehicle_id, 'wake_up')
 
     def update(self, car_id):
@@ -72,7 +65,7 @@ def update(self, car_id):
             self.__state[car_id] = data['vehicle_state']
             self.__driving[car_id] = data['drive_state']
             self.__last_update_time[car_id] = time.time()
-            self.debug_msg(
+            self.__logger.debug(
                 'Update requested:\n\t'
                 'Cat_ID: {}\n\t'
                 'TS: \n\t\t'