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: 797bf9830c6b
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: 7f5e26497171
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 17, 2015

  1. import order

    @sbourdeauducq
    sbourdeauducq committed Oct 17, 2015
    Copy the full SHA
    5899825 View commit details

  2. ctlmgr: add hostname to log source

    @sbourdeauducq
    sbourdeauducq committed Oct 17, 2015
    Copy the full SHA
    7f5e264 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 artiq/frontend/artiq_ctlmgr.py
  2. +2 −2 artiq/language/logging.py
3 changes: 2 additions & 1 deletion artiq/frontend/artiq_ctlmgr.py
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
import subprocess
import shlex
import socket
import platform

from artiq.protocols.sync_struct import Subscriber
from artiq.protocols.pc_rpc import AsyncioClient, Server
@@ -292,7 +293,7 @@ def main():
root_logger = logging.getLogger()
root_logger.setLevel(logging.NOTSET)
source_adder = SourceFilter(logging.WARNING + args.quiet*10 - args.verbose*10,
"ctlmgr")
"ctlmgr({})".format(platform.node()))
console_handler = logging.StreamHandler()
console_handler.setFormatter(logging.Formatter(
"%(levelname)s:%(source)s:%(name)s:%(message)s"))
4 changes: 2 additions & 2 deletions artiq/language/logging.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from artiq.language.environment import *

import logging

from artiq.language.environment import *


__all__ = ["LogExperiment"]