From 3274d78bac3865d7567194faa6564570da7e6e60 Mon Sep 17 00:00:00 2001 From: Sergey Isachenko Date: Mon, 18 Sep 2017 17:33:32 +0300 Subject: [PATCH] fixing slow execution --- setup.py | 2 +- teslajsonpy/connection.py | 2 +- teslajsonpy/controller.py | 15 ++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 7cf689d9..48632f6d 100644 --- 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 index d535d5ea..b742e6f4 100644 --- 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 index 7e85b0cc..5e062ef4 100644 --- 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'