storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject storm git commit: Merge branch 'STORM-3164-1.x-branch' of https://github.com/mal/storm into STORM-3164-1.x
Date Mon, 30 Jul 2018 21:15:25 GMT
Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch 487b81d07 -> ed79d96dd


Merge branch 'STORM-3164-1.x-branch' of https://github.com/mal/storm into STORM-3164-1.x

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

This closes #2782


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed79d96d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed79d96d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed79d96d

Branch: refs/heads/1.1.x-branch
Commit: ed79d96dd277ae2720c3766758ef921d748a108f
Parents: 487b81d
Author: Robert Evans <evans@yahoo-inc.com>
Authored: Mon Jul 30 14:58:46 2018 -0500
Committer: Robert Evans <evans@yahoo-inc.com>
Committed: Mon Jul 30 15:16:04 2018 -0500

----------------------------------------------------------------------
 .../python/src/main/resources/resources/storm.py    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ed79d96d/storm-multilang/python/src/main/resources/resources/storm.py
----------------------------------------------------------------------
diff --git a/storm-multilang/python/src/main/resources/resources/storm.py b/storm-multilang/python/src/main/resources/resources/storm.py
index 42b6378..0af6e8b 100755
--- a/storm-multilang/python/src/main/resources/resources/storm.py
+++ b/storm-multilang/python/src/main/resources/resources/storm.py
@@ -196,8 +196,8 @@ class Bolt(object):
                     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):
@@ -222,11 +222,11 @@ class BasicBolt(object):
                     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):
@@ -266,5 +266,5 @@ class Spout(object):
                 if msg["command"] == "fail":
                     self.fail(msg["id"])
                 sync()
-        except Exception as e:
-            reportError(traceback.format_exc(e))
+        except Exception:
+            reportError(traceback.format_exc())


Mime
View raw message