Skip to content

Commit a3bc87c

Browse files
examples: use labgrid's StepLogger/basicConfig
StepReporter is deprecated, use StepLogger instead. While at it, make use of labgrid's basicConfig(). It provides a very similar format string, so drop all redundant arguments. Also switch from DEBUG to INFO log level for various examples that do not benefit from such a noisy log level. Signed-off-by: Bastian Krause <[email protected]>
1 parent c872e7f commit a3bc87c

File tree

7 files changed

+34
-60
lines changed

7 files changed

+34
-60
lines changed

examples/deditec-relais8/deditec.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
import sys
21
import logging
32
import time
43

5-
from labgrid import Target, StepReporter
4+
from labgrid import Target
5+
from labgrid.logging import basicConfig, StepLogger
66
from labgrid.resource.udev import DeditecRelais8
77
from labgrid.driver import DeditecRelaisDriver
88

9-
# enable debug logging
10-
logging.basicConfig(
11-
level=logging.DEBUG,
12-
format='%(levelname)7s: %(message)s',
13-
stream=sys.stderr,
14-
)
9+
# enable info logging
10+
basicConfig(level=logging.INFO)
1511

16-
# show labgrid steps on the console
17-
StepReporter.start()
12+
# log labgrid steps
13+
StepLogger.start()
1814

1915
t = Target('main')
2016
r = DeditecRelais8(t, name=None, index=1)

examples/deditec-relais8/deditec_remote.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
import sys
21
import logging
32
import time
43

5-
from labgrid import Environment, StepReporter
4+
from labgrid import Environment
5+
from labgrid.logging import basicConfig, StepLogger
66

7-
# enable debug logging
8-
logging.basicConfig(
9-
level=logging.DEBUG,
10-
format='%(levelname)7s: %(message)s',
11-
stream=sys.stderr,
12-
)
7+
# enable info logging
8+
basicConfig(level=logging.INFO)
139

1410
# show labgrid steps on the console
15-
StepReporter.start()
11+
StepLogger.start()
1612

1713
e = Environment('import-dedicontrol.yaml')
1814
t = e.get_target()

examples/library/test.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@
44
import sys
55
import logging
66

7-
from labgrid import Environment, StepReporter
7+
from labgrid import Environment
8+
from labgrid.logging import basicConfig, StepLogger
89
from labgrid.strategy.bareboxstrategy import Status
910

1011

11-
# enable debug logging
12-
logging.basicConfig(
13-
level=logging.DEBUG,
14-
format='%(levelname)7s: %(message)s',
15-
stream=sys.stderr,
16-
)
12+
# enable info logging
13+
basicConfig(level=logging.INFO)
1714

18-
# show labgrid steps on the console
19-
StepReporter.start()
15+
# log labgrid steps
16+
StepLogger.start()
2017

2118
def run_once(target):
2219
s = target.get_driver('BareboxStrategy')

examples/networkmanager/nm.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
import logging
2-
import sys
32
from pprint import pprint
43

5-
from labgrid import Environment, StepReporter
4+
from labgrid import Environment
5+
from labgrid.logging import basicConfig, StepLogger
66

77

88
# enable debug logging
9-
logging.basicConfig(
10-
level=logging.DEBUG,
11-
format='%(levelname)7s: %(message)s',
12-
stream=sys.stderr,
13-
)
9+
basicConfig(level=logging.DEBUG)
1410

1511
# show labgrid steps on the console
16-
StepReporter.start()
12+
StepLogger.start()
1713

1814

1915
e = Environment('nm.env')

examples/sigrok/main.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66
import logging
77

88
from labgrid import Environment
9+
from labgrid.logging import basicConfig
910

10-
# enable debug logging
11-
logging.basicConfig(
12-
level=logging.DEBUG,
13-
format='%(levelname)7s: %(message)s',
14-
stream=sys.stderr,
15-
)
11+
# enable info logging
12+
basicConfig(level=logging.INFO)
1613

1714
env = Environment(sys.argv[1])
1815
target = env.get_target('main')

examples/sysfsgpio/sysfsgpio.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
import sys
21
import logging
32
import time
43

5-
from labgrid import StepReporter, Target
4+
from labgrid import Target
5+
from labgrid.logging import basicConfig, StepLogger
66
from labgrid.driver import GpioDigitalOutputDriver
77
from labgrid.resource import SysfsGPIO
88

9-
# enable debug logging
10-
logging.basicConfig(
11-
level=logging.DEBUG,
12-
format='%(levelname)7s: %(message)s',
13-
stream=sys.stderr,
14-
)
9+
# enable info logging
10+
basicConfig(level=logging.INFO)
1511

1612
# show labgrid steps on the console
17-
StepReporter.start()
13+
StepLogger.start()
1814

1915
t = Target('main')
2016
r = SysfsGPIO(t, name=None, index=60)

examples/sysfsgpio/sysfsgpio_remote.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
import sys
21
import logging
32
import time
43

5-
from labgrid import StepReporter, Environment
4+
from labgrid import Environment
5+
from labgrid.logging import basicConfig, StepLogger
66

7-
# enable debug logging
8-
logging.basicConfig(
9-
level=logging.DEBUG,
10-
format='%(levelname)7s: %(message)s',
11-
stream=sys.stderr,
12-
)
7+
# enable info logging
8+
basicConfig(level=logging.INFO)
139

1410
# show labgrid steps on the console
15-
StepReporter.start()
11+
StepLogger.start()
1612

1713
e = Environment('import-gpio.yaml')
1814
t = e.get_target()

0 commit comments

Comments
 (0)