Skip to content

Commit

Permalink
Merge branch 'STORM-3164-1.x-branch' of https://github.com/mal/storm
Browse files Browse the repository at this point in the history
…into STORM-3164-1.x

STORM-3164: Fix usage of traceback.format_exc in multilang

This closes #2782
  • Loading branch information
Robert Evans committed Jul 30, 2018
2 parents 93732d3 + 9394f82 commit 7c4ae00
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions storm-multilang/python/src/main/resources/resources/storm.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ def run(self):
sync()
else:
self.process(tup)
except Exception as e:
reportError(traceback.format_exc(e))
except Exception:
reportError(traceback.format_exc())

class BasicBolt(object):
def initialize(self, stormconf, context):
Expand All @@ -222,11 +222,11 @@ def run(self):
try:
self.process(tup)
ack(tup)
except Exception as e:
reportError(traceback.format_exc(e))
except Exception:
reportError(traceback.format_exc())
fail(tup)
except Exception as e:
reportError(traceback.format_exc(e))
except Exception:
reportError(traceback.format_exc())

class Spout(object):
def initialize(self, conf, context):
Expand Down Expand Up @@ -266,5 +266,5 @@ def run(self):
if msg["command"] == "fail":
self.fail(msg["id"])
sync()
except Exception as e:
reportError(traceback.format_exc(e))
except Exception:
reportError(traceback.format_exc())

0 comments on commit 7c4ae00

Please sign in to comment.