Skip to content

Commit

Permalink
Merge pull request #5357 from willkg/1383113-breakpad-2
Browse files Browse the repository at this point in the history
bug 1383113: remove DotDict usage in breakpad rules
  • Loading branch information
willkg committed Apr 27, 2020
2 parents bd0105e + d8a51dd commit 4988322
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions socorro/processor/rules/breakpad.py
Expand Up @@ -10,7 +10,6 @@
import subprocess
import threading

from configman.dotdict import DotDict
import glom
import markus

Expand Down Expand Up @@ -165,17 +164,17 @@ def _execute_external_process(
self.logger.warning(msg + " (%s)" % crash_id)
output = {}

stackwalker_data = DotDict()
stackwalker_data.json_dump = output
stackwalker_data.mdsw_return_code = return_code

stackwalker_data.mdsw_status_string = output.get("status", "unknown error")
stackwalker_data.success = stackwalker_data.mdsw_status_string == "OK"
stackwalker_data = {
"json_dump": output,
"mdsw_return_code": return_code,
"mdsw_status_string": output.get("status", "unknown error"),
"success": output.get("status", "") == "OK",
}

self.metrics.incr(
"run",
tags=[
"outcome:%s" % ("success" if stackwalker_data.success else "fail"),
"outcome:%s" % ("success" if stackwalker_data["success"] else "fail"),
"exitcode:%s" % return_code,
],
)
Expand All @@ -185,10 +184,10 @@ def _execute_external_process(
processor_meta["processor_notes"].append(msg)
self.logger.warning(msg + " (%s)" % crash_id)

elif return_code != 0 or not stackwalker_data.success:
elif return_code != 0 or not stackwalker_data["success"]:
msg = "MDSW failed with %s: %s" % (
return_code,
stackwalker_data.mdsw_status_string,
stackwalker_data["mdsw_status_string"],
)
# subprocess.Popen with shell=False returns negative exit codes
# where the number is the signal that got kicked up
Expand Down

0 comments on commit 4988322

Please sign in to comment.