Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[innogysmarthome] Reconnect fixes (#8182) #8318

Merged
merged 22 commits into from
Aug 20, 2020
Merged

[innogysmarthome] Reconnect fixes (#8182) #8318

merged 22 commits into from
Aug 20, 2020

Conversation

Novanic
Copy link
Contributor

@Novanic Novanic commented Aug 19, 2020 •
edited
Loading

This pull-request fixes a few reconnect problems regarding the WebSocket, see issue #8182 for more information

  • When an error occurred while starting the websocket, no reconnect attempt was started which caused that the binding loses the connection (till the next restart of the server or binding), see issue [innogysmarthome] Insufficient reconnect attempts #8182 for more information
  • When an error occurs, it is now waited at least for 30 seconds for the next reconnect attempt to avoid too many requests (on re-occurring errors).
  • Fix for a side-effect of "Fix possible resource leak [innogysmarthome] Fix possible resource leak #8080" (the websocket were closed unnormally by default which could trigger false and about one reconnect attempt per second).
  • NullPointerException fixed

Novanic and others added 21 commits June 10, 2020 19:50
@Novanic
Merge pull request #1 from openhab/2.5.x
78699f9 
Update
@Novanic
Merge pull request #2 from openhab/2.5.x
ae6b891 
Update
@Novanic
Merge pull request #3 from openhab/2.5.x
66abc11 
Update
@Novanic
Merge pull request #4 from openhab/2.5.x
4f2cd51 
Update
@Novanic
Merge pull request #5 from openhab/2.5.x
bd9cfc1 
Update
@Novanic
Merge pull request #6 from openhab/2.5.x
de62002 
Update
@Novanic
Merge pull request #7 from openhab/2.5.x
ad272b7 
Update
@Novanic
Merge pull request #8 from openhab/2.5.x
76c47b8 
Update
@Novanic
Merge pull request #9 from openhab/2.5.x
2ce668b 
Update
@Novanic
Merge pull request #10 from openhab/2.5.x
bcfbee2 
Update
@Novanic
Merge pull request #11 from openhab/2.5.x
2d654b9 
Update
@Novanic
Merge pull request #12 from openhab/2.5.x
05de7f6 
Update
@Novanic
Merge pull request #13 from openhab/2.5.x
77b02c4 
Update
@sstrohschein
When an error occurs, it is waited at least for 30 seconds to avoid t…
0d35899 
…oo many requests (on re-occurring errors).

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Code optimization
4c67a6f 
Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Workaround for side-effect of "Fix possible resource leak #8080"
d881c2d 
Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Workaround for side-effect of "Fix possible resource leak #8080" - Im…
a57883f 
…proved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
- NPE fixed
34b0fa6 
- Code-Optimization

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Code-Optimization
e5e9743 
Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Code-Optimization
33e6422 
Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@sstrohschein
Code-Optimization
2542337 
Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@Hilbrand Hilbrand added the bug An unexpected problem or unintended behavior of an add-on label Aug 20, 2020
Hilbrand
Hilbrand approved these changes Aug 20, 2020
View reviewed changes
Copy link
Member

@Hilbrand Hilbrand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. only a small style comment, which I'll fix with GitHub commit suggestion.

...ogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/InnogyWebSocket.java Outdated Show resolved Hide resolved
@Hilbrand
Update bundles/org.openhab.binding.innogysmarthome/src/main/java/org/…
283bde7 
…openhab/binding/innogysmarthome/internal/InnogyWebSocket.java
@Hilbrand Hilbrand merged commit b621062 into openhab:2.5.x Aug 20, 2020
@Hilbrand Hilbrand added this to the 2.5.8 milestone Aug 20, 2020
@Novanic
Copy link
Contributor Author

Novanic commented Aug 20, 2020

@Hilbrand Please revert the change again... :-( I don't understand what's going on with this binding... I tested it for weeks and now since it is merged I get rapid (re-)connect attempts again...

Please revert it shortly before the release of 2.5.8 (which may be built tomorrow?!).

@Novanic
Copy link
Contributor Author

Novanic commented Aug 20, 2020

Revert pull-request: #8324

Hilbrand pushed a commit that referenced this pull request Aug 21, 2020
@Novanic
Revert "[innogysmarthome] Reconnect fixes (#8182) (#8318)" (#8324)
ce5d4d8 
This reverts commit b621062.

Reopens #8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
@Hilbrand Hilbrand removed this from the 2.5.8 milestone Aug 21, 2020
taboneclayton pushed a commit to taboneclayton/openhab-addons that referenced this pull request Aug 23, 2020
@Novanic @taboneclayton
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
f18954b 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
Signed-off-by: Clayton Tabone <taboneclayton@gmail.com>
taboneclayton pushed a commit to taboneclayton/openhab-addons that referenced this pull request Aug 23, 2020
@Novanic @taboneclayton
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
e19b909 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
Signed-off-by: Clayton Tabone <taboneclayton@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
8547ab9 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
ef8e855 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
8aaba39 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
7fa0286 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
4023dfd 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
3294ea5 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
b59b370 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@Novanic @andrewfg
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
20afc9a 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
DaanMeijer pushed a commit to DaanMeijer/openhab-addons that referenced this pull request Sep 1, 2020
@Novanic @DaanMeijer
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
13f64f5 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
Signed-off-by: Daan Meijer <daan@studioseptember.nl>
DaanMeijer pushed a commit to DaanMeijer/openhab-addons that referenced this pull request Sep 1, 2020
@Novanic @DaanMeijer
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
ec6f048 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
Signed-off-by: Daan Meijer <daan@studioseptember.nl>
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Sep 12, 2020
@Novanic @CSchlipp
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
2a7292e 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Sep 12, 2020
@Novanic @CSchlipp
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
feda657 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
@Novanic @markus7017
[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)
e80655d 
* When an error occurs, it is waited at least for 30 seconds to avoid too many requests (on re-occurring errors).
* Workaround for side-effect of "Fix possible resource leak openhab#8080" - Improved by not rescheduling when the close/stop was actively triggered by the binding (in this case there is already a reschedule triggered)
* NPE fixed
* Code-Optimization

Closes openhab#8182 

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
@Novanic @markus7017
Revert "[innogysmarthome] Reconnect fixes (openhab#8182) (openhab#8318)…
d2a6d60 
…" (openhab#8324)

This reverts commit b621062.

Reopens openhab#8182

Signed-off-by: Sven Strohschein <sven.strohschein@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hilbrand Hilbrand Hilbrand approved these changes

@ollie-dev ollie-dev Awaiting requested review from ollie-dev ollie-dev is a code owner

Assignees
No one assigned
Labels
bug An unexpected problem or unintended behavior of an add-on
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Novanic @Hilbrand @sstrohschein