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

Changing exception #425

Merged
merged 2 commits into from
Jan 9, 2019
Merged

Changing exception #425

merged 2 commits into from
Jan 9, 2019

Conversation

gauravzqa
Copy link
Contributor

logger.error has now been changed to logger.exception

Fixes #357

logger.error has now been changed to logger.exception

Fixes mushorg#357
@coveralls
Copy link

coveralls commented Jan 3, 2019

Pull Request Test Coverage Report for Build 1125

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 77 unchanged lines in 5 files lost coverage.
  • Overall coverage decreased (-0.6%) to 70.909%

Files with Coverage Reduction New Missed Lines %
conpot/protocols/http/web_server.py 3 85.71%
conpot/protocols/guardian_ast/guardian_ast_server.py 3 81.37%
conpot/protocols/ftp/ftp_handler.py 14 80.66%
conpot/protocols/ftp/ftp_base_handler.py 22 77.37%
conpot/protocols/http/command_responder.py 35 54.32%
Totals Coverage Status
Change from base Build 1123: -0.6%
Covered Lines: 5365
Relevant Lines: 7566

💛 - Coveralls

bin/conpot Outdated
@@ -69,7 +69,7 @@ def logo():


def on_unhandled_greenlet_exception(dead_greenlet):
logger.error('Stopping because %s died: %s', dead_greenlet, dead_greenlet.exception)
logger.exception('Stopping because %s died: %s', dead_greenlet, dead_greenlet.exception)
Copy link
Member

Choose a reason for hiding this comment

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

Great start! Might as well improve on string formatting 🙂

Suggested change
logger.exception('Stopping because %s died: %s', dead_greenlet, dead_greenlet.exception)
logger.exception('Stopping because {} died: {}'.format(dead_greenlet, dead_greenlet.exception))

the old string was removed and was updated with the new fashion

Fixes mushorg#357
@xandfury
Copy link
Member

xandfury commented Jan 6, 2019

LGTM. Let us wait to see if others have anything else to say 🙂

@glaslos glaslos merged commit b1d7410 into mushorg:master Jan 9, 2019
@glaslos
Copy link
Member

glaslos commented Jan 9, 2019

Thanks for the contribution!

xandfury added a commit to xandfury/conpot that referenced this pull request Jul 30, 2019
* Break out port and ip

* Roughly handle mushorg#399 (not very PEP-8)

* Some PEP-8 adjustments as suggested in mushorg#402

* Adds random generated functions for function pointers in template.xml to support non static register values.

* fix tftp test

* Fixes crypto quality issues and extra space.

* Fix typo.

* Fix s7 parameter length calculation

* Docker fixes (mushorg#416)

* updated Dockerfile

* cleanup

* image size reduced

* multi stage build to reduce image size

* moved to alpine

* Fixed wrong Docker ports

* fix mushorg#418

add missing dependency libffi-dev

* Makefile for docker added

* Fixed exception loop in the FTP handler

* Changing exception (mushorg#425)

* updated dockerfile (mushorg#429) - related (mushorg#428)

With the recent update to pip 19.01 there was a build slight issue with the docker commands, refer here:
pypa/pip#6197

* Revert "docker/dockerfile:Updated dockerfile" (mushorg#432)

* Revert "updated dockerfile (mushorg#429) - related (mushorg#428)"
This reverts commit fe65c16.
* fix docker

* Added support for plc-stop signal. (mushorg#447)

* Added support for plc-stop signal.

* Added support for plc-stop signal and added it's tests.

* Added support for plc-stop signal and added it's tests.
srenfo pushed a commit to srenfo/conpot that referenced this pull request Jan 21, 2020
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.

None yet

4 participants