Browse Source
Merge pull request #238 from chehrlic/chris_vz
RPI: use a requests seesion for the volkszaehler plugin...
pull/244/head
Andreas Schiffler
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
2 deletions
-
tools/rpi/hoymiles/__main__.py
-
tools/rpi/hoymiles/outputs.py
|
|
@ -72,7 +72,8 @@ def poll_inverter(inverter, retries=4): |
|
|
|
# Handle the response data if any |
|
|
|
if response: |
|
|
|
c_datetime = datetime.now() |
|
|
|
print(f'{c_datetime} Payload: ' + hoymiles.hexify_payload(response)) |
|
|
|
if hoymiles.HOYMILES_DEBUG_LOGGING: |
|
|
|
print(f'{c_datetime} Payload: ' + hoymiles.hexify_payload(response)) |
|
|
|
decoder = hoymiles.ResponseDecoder(response, |
|
|
|
request=com.request, |
|
|
|
inverter_ser=inverter_ser |
|
|
|
|
|
@ -215,6 +215,7 @@ class VolkszaehlerOutputPlugin(OutputPluginFactory): |
|
|
|
""" |
|
|
|
super().__init__(**params) |
|
|
|
|
|
|
|
self.session = requests.Session() |
|
|
|
self.baseurl = config.get('url', 'http://localhost/middleware/') |
|
|
|
self.channels = dict() |
|
|
|
for channel in config.get('channels', []): |
|
|
@ -271,7 +272,7 @@ class VolkszaehlerOutputPlugin(OutputPluginFactory): |
|
|
|
uid = self.channels[ctype] |
|
|
|
url = f'{self.baseurl}/data/{uid}.json?operation=add&ts={ts}&value={value}' |
|
|
|
try: |
|
|
|
r = requests.get(url) |
|
|
|
r = self.session.get(url) |
|
|
|
if r.status_code != 200: |
|
|
|
raise ValueError('Could not send request (%s)' % url) |
|
|
|
except ConnectionError as e: |
|
|
|