Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aa50c5b4d97c
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b28b8e36e1b
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 24, 2016

  1. worker: do not print redundant exception information

    @sbourdeauducq
    sbourdeauducq committed Feb 24, 2016
    Copy the full SHA
    251aed0 View commit details

  2. style

    @sbourdeauducq
    sbourdeauducq committed Feb 24, 2016
    Copy the full SHA
    c3cdce9 View commit details

  3. worker: print core device tracebacks. Closes #292

    @sbourdeauducq
    sbourdeauducq committed Feb 24, 2016
    Copy the full SHA
    dda0e08 View commit details

  4. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Feb 24, 2016
    Copy the full SHA
    6b28b8e View commit details
Showing with 4 additions and 2 deletions.
  1. +1 −1 artiq/frontend/artiq_run.py
  2. +3 −1 artiq/master/worker_impl.py
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_run.py
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ def run(with_file=False):
except CompileError as error:
return
except Exception as exn:
if hasattr(exn, 'artiq_core_exception'):
if hasattr(exn, "artiq_core_exception"):
print(exn.artiq_core_exception, file=sys.stderr)
raise exn
finally:
4 changes: 3 additions & 1 deletion artiq/master/worker_impl.py
View file
Original file line number Diff line number Diff line change
@@ -257,9 +257,11 @@ def main():
if exc_str:
short_exc_info += ": " + exc_str
lines = ["Terminating with exception ("+short_exc_info+")\n"]
lines += traceback.format_exception_only(type(exc), exc)
if hasattr(exc, "artiq_core_exception"):
lines.append(str(exc.artiq_core_exception))
if hasattr(exc, "parent_traceback"):
lines += exc.parent_traceback
lines += traceback.format_exception_only(type(exc), exc)
logging.error("".join(lines).rstrip(),
exc_info=not hasattr(exc, "parent_traceback"))
put_object({"action": "exception"})