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.

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

Implement a cross platform file monitoring beacon #48615

Merged
merged 2 commits into from Jul 31, 2018

Conversation

Projects
None yet
5 participants
@wagdav
Copy link
Contributor

commented Jul 16, 2018

What does this PR do?

This PR implements a cross platform file monitoring beacon. This is done by wrapping the watchdog Python library.

This PR was co-authored with @marco-m

What issues does this PR fix or reference?

#28135

New Behavior

A new watchdog beacon can be configured

Tests written?

Yes

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@rallytime rallytime requested a review from garethgreenaway Jul 16, 2018

@rares-pop

This comment has been minimized.

Copy link
Contributor

commented Jul 17, 2018

Is this going to deprecate the inotify beacon?

@wagdav

This comment has been minimized.

Copy link
Contributor Author

commented Jul 18, 2018

@rares-pop I don't think it should/could deprecate the inotify beacon, in my opinion. The watchdog library only exposes a small subset of inotify's features.

@wagdav wagdav force-pushed the wagdav:dev-watchdog branch 3 times, most recently from 0a43496 to aef926a Jul 18, 2018

@wagdav

This comment has been minimized.

Copy link
Contributor Author

commented Jul 22, 2018

I fixed all the pylint and codeclimate issues. The remaining failing checks don't seem to be related to this branch.

@wagdav wagdav force-pushed the wagdav:dev-watchdog branch from aef926a to 8e16596 Jul 25, 2018

@garethgreenaway

This comment has been minimized.

Copy link
Member

commented Jul 25, 2018

@wagdav Very nice!

@marco-m

This comment has been minimized.

Copy link

commented Jul 25, 2018

Thanks for merging! SaltStack helped us greatly and this is a small give back.

@rallytime
Copy link
Contributor

left a comment

Hi @wagdav - I have some small requests for this PR. Can you make those updates?

Show resolved Hide resolved salt/beacons/watchdog.py
Show resolved Hide resolved salt/beacons/watchdog.py
Show resolved Hide resolved tests/unit/beacons/test_watchdog_beacon.py
@wagdav

This comment has been minimized.

Copy link
Contributor Author

commented Jul 26, 2018

@rallytime Thanks for the review! I pushed two commits with the requested changes. If you prefer I could also squash them in the previous commits.

@rallytime
Copy link
Contributor

left a comment

You can squash them if you like, but it isn't necessary.

Thanks!

@wagdav wagdav force-pushed the wagdav:dev-watchdog branch from bdcdac4 to 1827363 Jul 30, 2018

@wagdav

This comment has been minimized.

Copy link
Contributor Author

commented Jul 30, 2018

@rallytime I squashed the fixes and rebased onto the develop branch.

@rallytime rallytime merged commit c4a3510 into saltstack:develop Jul 31, 2018

4 of 9 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
codeclimate All good!
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details

@wagdav wagdav deleted the wagdav:dev-watchdog branch Aug 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.