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

Move ignore_storage call to discover_storage #7973

Merged
merged 2 commits into from Jan 5, 2018

Conversation

Projects
None yet
4 participants
@Sneddo
Copy link
Contributor

Sneddo commented Dec 28, 2017

Calling ignore_storage as part of discover_storage to ignore based on description. Also updated NetApp and ucd-dsktable to remove calls to ignore_storage in these discovery includes.

Tested the NetApp discovery and works as expected.

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

),
'storage'
);
if (ignore_storage($device['os'], $descr) != 1) {

This comment has been minimized.

@murrant

murrant Dec 29, 2017

Member

Can you change this to be like this?

if (ignore_storage($device['os'], $descr)) {
    echo 'i';
    return;
}

It saves an indent and long if statement.

@murrant

This comment has been minimized.

Copy link
Member

murrant commented Dec 29, 2017

Looks good, just a quick style fix. Then I'll give it a test :)

@laf laf added the Refactor label Dec 29, 2017

@scrutinizer-notifier

This comment has been minimized.

Copy link

scrutinizer-notifier commented Jan 2, 2018

The inspection completed: 1 updated code elements

@murrant murrant merged commit 4fc946b into librenms:master Jan 5, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@lock

This comment has been minimized.

Copy link

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.