This repository has been archived by the owner on Nov 29, 2021. It is now read-only.
Niceness #109
Merged
Niceness #109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add the --niceness option. Each scan will be run with the set niceness. Default is 10.
jjnicola
requested review from
mattmundell,
timopollmeier,
a team and
bjoernricks
Codecov Report
@@ Coverage Diff @@
## master #109 +/- ##
==========================================
+ Coverage 68.07% 68.19% +0.11%
==========================================
Files 8 8
Lines 1604 1610 +6
==========================================
+ Hits 1092 1098 +6
Misses 512 512
Continue to review full report at Codecov.
|
bjoernricks
suggested changes
Jun 3, 2019
ospd/misc.py
Outdated
| @@ -868,6 +878,9 @@ def filename(string): | |||
| help='Path to the logging file.') | |||
| parser.add_argument('--version', action='store_true', | |||
| help='Print version then exit.') | |||
| parser.add_argument('--niceness', default=NICENESS, type=niceness, | |||
There was a problem hiding this comment.
Is there any reason for defining an own type instead using the default int type https://docs.python.org/3/library/argparse.html#type ?
ospd/ospd.py
Outdated
| @@ -200,7 +200,7 @@ class OSPDaemon(object): | |||
| specific options eg. the w3af profile for w3af wrapper. | |||
| """ | |||
|
|
|||
| def __init__(self, certfile, keyfile, cafile, | |||
| def __init__(self, certfile, keyfile, cafile, niceness, | |||
There was a problem hiding this comment.
Personally I would make niceness optional
Suggested change
| def __init__(self, certfile, keyfile, cafile, niceness, | |
| def __init__(self, certfile, keyfile, cafile, niceness=None, |
ospd/ospd_ssh.py
Outdated
| @@ -140,6 +142,7 @@ def run_command(self, scan_id, host, cmd): | |||
| self.add_scan_error(scan_id, host=host, value=str(err)) | |||
| return None | |||
|
|
|||
| cmd = "nice -n %s %s" % (self.NICENESS, cmd) | |||
There was a problem hiding this comment.
Suggested change
| cmd = "nice -n %s %s" % (self.NICENESS, cmd) | |
| if self.NICENESS is not None: | |
| cmd = "nice -n %s %s" % (self.NICENESS, cmd) |
ospd/ospd_ssh.py
Outdated
| cafile=cafile) | ||
| cafile=cafile, niceness=niceness) | ||
|
|
||
| self.NICENESS = niceness |
There was a problem hiding this comment.
Any reason why self.NICENESS is all uppercase here? I would mark it as a private variable by using
Suggested change
| self.NICENESS = niceness | |
| self._niceness = niceness |
bjoernricks
suggested changes
Jun 3, 2019
ospd/ospd_ssh.py
Outdated
| @@ -77,11 +77,13 @@ class OSPDaemonSimpleSSH(OSPDaemon): | |||
| an array. | |||
| """ | |||
|
|
|||
| def __init__(self, certfile, keyfile, cafile): | |||
| def __init__(self, certfile, keyfile, cafile, niceness): | |||
There was a problem hiding this comment.
Just this single change is missing to make niceness optional here too
Suggested change
| def __init__(self, certfile, keyfile, cafile, niceness): | |
| def __init__(self, certfile, keyfile, cafile, niceness=None): |
bjoernricks
reviewed
Jun 3, 2019
bjoernricks
previously approved these changes
Jun 3, 2019
Co-Authored-By: Björn Ricks <[email protected]>
bjoernricks
approved these changes
Jun 3, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add the --niceness option. Each scan will be run with the passed niceness.
Default is 10.