Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion m4
2 changes: 1 addition & 1 deletion pythia/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ EXTRA_DIST = \
journal/colors/__init__.py \
journal/colors/__vault__.odb \
journal/colors/dark-bg.odb \
journal/colors/dark-bg.cfg \
journal/colors/light-bg.odb \
journal/colors/light-bg.cfg \
journal/colors/dark-bg.cfg \
journal/colors/none.odb \
journal/components/Channel.py \
journal/components/ChannelFacility.py \
Expand Down
10 changes: 5 additions & 5 deletions pythia/journal/colors/dark-bg.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

[dark-bg]

filename = LightGreen
line = LightGreen
function = LightPurple
src = Yellow
filename = DarkGray
line = DarkGray
function = DarkGray
src = DarkGray

facility = LightBlue
facility = LightPurple
severity-debug = LightCyan
severity-info = LightGreen
severity-error = LightRed
Expand Down
10 changes: 5 additions & 5 deletions pythia/journal/colors/light-bg.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

[light-bg]

filename = Green
line = Green
function = Purple
src = Red
filename = LightGray
line = LightGray
function = LightGray
src = LightGray

facility = Blue
facility = Purple
severity-debug = Cyan
severity-info = Green
severity-error = Red
Expand Down
2 changes: 1 addition & 1 deletion pythia/journal/components/Renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Inventory(Component.Inventory):

header = pythia.pyre.inventory.str(
"header",
default=" >> %(filename)s:%(line)s:%(function)s\n -- %(facility)s(%(severity)s)")
default=" >> %(filename)s:%(line)s:%(function)s\n -- %(severity)s (%(facility)s)")
header.meta['tip'] = "the first line of the generated message"

footer = pythia.pyre.inventory.str("footer", default="")
Expand Down
3 changes: 2 additions & 1 deletion pythia/journal/devices/Console.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class Console(Device):
def _write(self, text):
for line in text:
print(line)

import sys
sys.stdout.flush()
return


Expand Down
1 change: 1 addition & 0 deletions pythia/pyre/inventory/Configurable.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ def __init__(self, name=None):
self._info = info(name)
self._error = error(name)
self._warning = warning(name)
self._flow = info("application-flow")

# modify the inventory defaults that were hardwired at compile time
# gives derived components an opportunity to modify their default behavior
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ pythia.pyre =
schedulers/scripts/*/*.odb
pythia.mpi =
launchers/*.odb
pythia.journal =
colors/*.cfg
pythia.blade =
toolkits/*.odb
toolkits/*/*.odb
Expand Down
2 changes: 1 addition & 1 deletion tests/pytests/journal/test_facilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_file(self):
logLines = log.readlines()
self.assertEqual(4, len(logLines))
iLine = 2
self.assertEqual("-- debug_on(debug)", logLines[iLine].strip())
self.assertEqual("-- debug (debug_on)", logLines[iLine].strip())
iLine += 1
self.assertEqual("-- This journal should be on.", logLines[iLine].strip())
os.remove(filename)
Expand Down
Loading