diff --git a/dca-carouge-watering/app.py b/dca-carouge-watering/app.py index 89bf8860745ce739b5cc538cf7c1acc43ec3cc03..1221f340e10f32fdc847c9438989d57610a00fd9 100755 --- a/dca-carouge-watering/app.py +++ b/dca-carouge-watering/app.py @@ -144,6 +144,7 @@ def _log_level_of_moisture(cb, sensor): else: app.logger.error("Measurement not in expected range: {} cb".format(cb)) + def _log_level_of_battery_level(bat, sensor): if bat < 0.5: @@ -256,15 +257,16 @@ def _update_flowerbed_entity(soil_moisture, sensor_eui): app.logger.debug('Found FlowerBed {} associated to sensor {}'.format(flowerbed_id, sensor_eui)) + body = {"soilMoisture": get_ngsiv2_typed_description(soil_moisture)} url = "{}/v2/entities/{}/attrs".format(URL_BASE, flowerbed_id) r = client_request.patch( url=url, headers=http_header_post, - json={ - "soilMoisture": get_ngsiv2_typed_description(soil_moisture) - } + json=body ) + app.logger.debug('Sending data to CTX broker: {}'.format(body)) + if not (200 <= r.status_code < 300): app.logger.error('HTTP status code not 2xx, something went wrong..') app.logger.error(r.status_code) @@ -272,7 +274,7 @@ def _update_flowerbed_entity(soil_moisture, sensor_eui): app.logger.error(r.json()) return "Got error {}".format(r.reason) else: - app.logger.info('HTTP response is {} - Entity updated'.format(r.status_code)) + app.logger.info('Entity updated (code {}), url {}'.format(r.status_code, url)) return "ok" @@ -352,7 +354,6 @@ def _update_device_entity(deveui, comment, longitude, latitude, last_reception, body.update({'value': get_ngsiv2_typed_description(moist)}) body.update({'batteryLevel': get_ngsiv2_typed_description(bat)}) - if dataFrame_rssi: body.update({'rssi': get_ngsiv2_typed_description(dataFrame_rssi)}) @@ -372,7 +373,7 @@ def _update_device_entity(deveui, comment, longitude, latitude, last_reception, app.logger.error(r.json()) return "Got error {}".format(r.reason) else: - app.logger.info('HTTP response is {} - Entity updated'.format(r.status_code)) + app.logger.info('Entity updated (code {}), url {}'.format(r.status_code, url)) return "ok"