Skip to content

Commit

Permalink
Catch fingerprint exceptions
Browse files Browse the repository at this point in the history
* README.md
  -- Updated to reflect JBoss 8.1 update
* src/core/fingerprint.py
  -- Initially I wanted to handle all exceptions in fingerprints, but
  that doesnt appear to be very feasible.  We now catch and log all exceptions
  not caught by the fingerprint, as opposed to crashing horribly.
  • Loading branch information
hatRiot committed Jun 14, 2014
1 parent 0550c48 commit 15670e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ clusterd features
several more currently in development and research phases

* JBoss
- Versions 3.x - 8.0
- Versions 3.x - 8.1
- Currently supported deployers:
+ /jmx-console/MainDeployer for 3.x, 4.x, and 6.x
+ /jmx-console/DeploymentFileRepository for 3.x, 4.x, and 5.x
Expand Down
15 changes: 9 additions & 6 deletions src/core/fingerprint.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,15 @@ def definitions(self, ip, port, service):
utility.Msg("Checking %s version %s %s..." % (fp.platform,
fp.version, fp.title))

if fp.check(ip, port):

# set fingerprint port to match fingerengine port if defined
if vars(self.options)['port']:
fp.port = self.options.port
match_fps.append(fp)
try:
if fp.check(ip, port):

# set fingerprint port to match fingerengine port if defined
if vars(self.options)['port']:
fp.port = self.options.port
match_fps.append(fp)
except Exception, e:
utility.Msg("Exception with fingerprint: %s" % e, LOG.DEBUG)

return match_fps

Expand Down

0 comments on commit 15670e5

Please sign in to comment.