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

1376 - Initial contribution of ZoneMinder Binding #1376

Closed
wants to merge 109 commits into from
Closed

1376 - Initial contribution of ZoneMinder Binding #1376

wants to merge 109 commits into from

Conversation

Mr-Eskildsen
Copy link

First version of a ZoneMinder Binding . It handles basic operations, eg. trigger zoneminder from OpenHAB, and monitors health status of ZoneMinder Server from OpenHAB.

MartinEskildsen added 30 commits October 21, 2016 20:38
Initial version of ZoneMinder Binding.
92db05e
Every source file has been cleaned.
9687223
Fixed missing libraries (jackson-*.jar)
e04ba0c
Fixed mixing of new high priority and low priority parameter in Server
12a38e4 
bridge
Improvements regarding Initialisation of Server Thing and Discovery of
aac44e7 
Monitor Thing
Fixed misconfiguration of Monitor from discovery, which resulted in
04ded82 
monitor going offline
Removed local variables representing OH config, instead the config class
b5cfa3b 
from OH is used
Added handlers for all channels to avoid log entries in OpenHAB
fcbe950
Added missing handler for SourceTupe channel in Monitor
01dedd8
First attempt to update channels from server.
cd627e6
Initial handling of DiskUsage and CPULoad
1fff812
Disk Usage fetched in low priority loop
905b48f
Changed TimeUnit in low priority job to Minutes
a5ecd00
Basic handling of initialisation problems. For all objects
21c61b9
Fixed problem with Bridge staying offline with errornous config.
52cec07
Fixed missing break in switch, cause a lot of entries in the OH error
c17d063 
log
Before rework of API access
13960cd
First working version of major rework
590f8fc
Fixes #2, #3, #8, #9, #11,#13
3c4bd67
Initial version of ZoneMinder Binding.
c0ae5c5
Every source file has been cleaned.
89c8480
Fixed missing libraries (jackson-*.jar)
ff5baeb
Fixed mixing of new high priority and low priority parameter in Server
1304943 
bridge
Improvements regarding Initialisation of Server Thing and Discovery of
d599650 
Monitor Thing
Fixed misconfiguration of Monitor from discovery, which resulted in
80f7091 
monitor going offline
Removed local variables representing OH config, instead the config class
fad0b1a 
from OH is used
Added handlers for all channels to avoid log entries in OpenHAB
6110ebe
Added missing handler for SourceTupe channel in Monitor
134a688
First attempt to update channels from server.
8d15d7d
Initial handling of DiskUsage and CPULoad
5a50a51
@Mr-Eskildsen Mr-Eskildsen reopened this Jan 23, 2017
@Mr-Eskildsen
Copy link
Author

This build does address some bugs during initialisation, which will likely cause one or more monitors not to be initialised correct. Furthermore the discovery service has been rewritten, now it works like the ZWave Binding, eg. you will have to create a Bridge Thing, and then the monitors will be automatically discovered.
org.openhab.binding.zoneminder-2.1.0-SNAPSHOT.zip

MartinEskildsen added 2 commits January 25, 2017 00:26
@Mr-Eskildsen
Copy link
Author

Mr-Eskildsen commented Jan 25, 2017 •
edited
Loading

@kaikreuzer: I would like to reqeust a code review for this Binding.
I have a few comments my self:

  • I have merged with the 2.1.0, so it should be pretty much aligned to the master branch.
  • It claims that some files in other bindings has changed. I don't understand why and/or how that has happended. I have ONLY changed the pom.xml outside the zoneminder binding. That did cause an merge conflict because ofd the new ZWay binding, That has been solved. If I can/should do something please let me know.
  • If you see something that should obvious be changed throughout all files, please let me know, instead of you wasting your time looking for the same problem in 10 different files.
  • The binding has been actively tested in my own setup and in another users setup. I have seen some stability problems, which should have been solved by now (that is the reason for taking so long time).

If you think any of the above comments requires me to do some additional changes, please let me know up front.

UPDATE: I looked a bit more into to the merge conflicts. I now believe that I have managed to align my fork with the upstream&master. If not, then please let me know .

@Mr-Eskildsen
Copy link
Author

New build, primarily additional logging and improved handling of Thing ONLINE / OFFLINE status
org.openhab.binding.zoneminder-2.1.0-SNAPSHOT.zip

@Mr-Eskildsen
Copy link
Author

New build that does correctly detect a ZoneMinder Instance when it run any language (and not just english).
org.openhab.binding.zoneminder-2.1.0-SNAPSHOT.zip

@whopperg
Copy link

Hey @Mr-Eskildsen ,

just checked out the latest release and im getting a lot of Infos in my openhab.log:
2017-01-29 15:58:46.394 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 15:59:02.553 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 15:59:17.863 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 15:59:33.177 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 15:59:48.497 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 16:00:03.808 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 16:00:19.119 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 16:00:34.429 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 16:00:49.746 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE' 2017-01-29 16:01:05.066 [INFO ] [andler.ZoneMinderServerBridgeHandler] - [BRIDGE (914be859)]: Bridge status changed from 'ONLINE' to 'ONLINE'
Maybe some leftover debug code?

Otherwhise, seems to work jsut fine!

Cheers

@Mr-Eskildsen
Copy link
Author

Hi @whopperg,

Actually it is a small bug that has been corrected. I was trying only to log when state has changed. I didn't build a new a jar, but since it has been pinpointed a couple of times I will provide a build that corresponds to the latest source :-)

org.openhab.binding.zoneminder-2.1.0-SNAPSHOT.zip

Updated zoneminder4j so that ZoneMinder is correctly detected when it is
2a69b9d 
running other language than english

Update .classpath

 Changes to be committed:
	modified:   addons/binding/org.openhab.binding.zoneminder/.classpath
	modified:   addons/binding/org.openhab.binding.zoneminder/META-INF/MANIFEST.MF
	new file:   addons/binding/org.openhab.binding.zoneminder/lib/zoneminder4j-0.9.7.jar
@kaikreuzer kaikreuzer removed the awaiting feedback Awaiting feedback from the pull request author label Jan 31, 2017
@kaikreuzer
Copy link
Member

Thanks @Mr-Eskildsen!

There seems to be something very wrong with your branch, though. It shows 147 changed files, many not related to your binding.
Note that you should actually NEVER merge master or other branches into your feature branch - instead, you should regularly rebase your feature branch onto the latest master.
I'd suggest you first clean up your branch before I do another review.

@kaikreuzer kaikreuzer added the awaiting feedback Awaiting feedback from the pull request author label Jan 31, 2017
@Mr-Eskildsen Mr-Eskildsen mentioned this pull request Jan 31, 2017
Merged
@kaikreuzer
Copy link
Member

Replaced by #1812.

@kaikreuzer kaikreuzer closed this Feb 2, 2017
Flole998 pushed a commit to Flole998/openhab-addons that referenced this pull request Dec 30, 2021
@cweitkamp
Add implicit import for units to rule models (openhab#1376)
253f9ab 
Signed-off-by: Christoph Weitkamp <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaikreuzer kaikreuzer kaikreuzer requested changes

Assignees
No one assigned
Labels
awaiting feedback Awaiting feedback from the pull request author new binding If someone has started to work on a binding. For a new binding PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mr-Eskildsen @whopperg @kaikreuzer