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

Added try/catch for format_ips url read logic. #61

Merged
merged 5 commits into from
Aug 18, 2015

Conversation

vaizguy
Copy link
Contributor

@vaizguy vaizguy commented Aug 10, 2015

Added try/catch for HTTPError in case threat intelligence feed page isn't available; Fixes system crash during boot if urllib2 gets a Forbidden 403 (or any other HTTPError). This is only if the user decides during setup to enable script execution on boot.

…sn't available. Fixes system crash during boot.
@TheAngryByrd
Copy link

👍 will checkout soon

@vaizguy
Copy link
Contributor Author

vaizguy commented Aug 12, 2015

Sorry about the second commit, I didn't think it would get included by default in the previously created pull request. I have changed the base URL because artillery installed with your repo path which for now is missing the commit e6f54b0 and causes it to crash on my machine on boot every time, I will add a commit range to exclude the commit 0d2d14b from the pull request.

@vaizguy
Copy link
Contributor Author

vaizguy commented Aug 12, 2015

Okay I have reverted my last commit so you can go ahead with the pull request as it will include only the desired commit.

trustedsec pushed a commit that referenced this pull request Aug 18, 2015
Added try/catch for format_ips url read logic.
@trustedsec trustedsec merged commit 11dc55f into trustedsec:master Aug 18, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants