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

Add code for XMPP bots #462

Merged
merged 2 commits into from
Mar 15, 2016
Merged

Add code for XMPP bots #462

merged 2 commits into from
Mar 15, 2016

Conversation

rolandgeider
Copy link

This includes the code for both the collector and the output bots. Code is a tidied up version of the code from PRs 158 and 197, as well as the comments there.

Thanks to @helderfernandes1279 for the original code.

This includes the code for both the collector and the output bots.
Code is based on the example in PRs 158 and 197.
@sebix
Copy link
Member

sebix commented Mar 11, 2016

  • The tests are failing because the BOTS-file should be sorted (as the ordering is directly used by the manager)
  • What is the minimum version of sleekxmpp necessary (or tested with)? Please add this to the requirements
  • As we are still supporting Python2, please add from __future__ import unicode_literals to the collector.
  • The output bot class should be named XMPPOutputBot for the sake of consistent naming.
  • Please don't import sys from intelmq.lib.bot

* Sort list alphabetically
* Set specific version of xmpp library in the requirements file
* Small cleanup of collector file
@codecov-io
Copy link

Current coverage is 66.44%

Merging #462 into master will decrease coverage by -0.32% as of 3705e99

@@            master    #462   diff @@
======================================
  Files          173     175     +2
  Stmts         6682    6750    +68
  Branches         0       0       
  Methods          0       0       
======================================
+ Hit           4461    4485    +24
  Partial          0       0       
- Missed        2221    2265    +44

Review entire Coverage Diff as of 3705e99

Powered by Codecov. Updated on successful CI builds.

@rolandgeider
Copy link
Author

@sebix I have fixed the issues in one go, while I'm all for atomic commits, I think in this case it's OK :)

sebix added a commit that referenced this pull request Mar 15, 2016
ENH: XMPP collector and output bot
@sebix sebix merged commit fac7721 into certtools:master Mar 15, 2016
@sebix sebix added this to the Release 1 - v1.0 milestone Mar 15, 2016
@sebix sebix self-assigned this Mar 15, 2016
@sebix
Copy link
Member

sebix commented Mar 15, 2016

Thanks for this contribution!

@dmth dmth deleted the xmpp branch March 30, 2016 13:13

try:
self.get_roster()
except IqError as err:
Copy link
Member

Choose a reason for hiding this comment

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

IqError is not defined

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants