Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-21 07:51:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4049 from matrix-org/erikj/synctl_colour

Browse Source 
Only colourise synctl output when attached to tty
This commit is contained in:
Erik Johnston 2018-10-18 10:51:14 +01:00 committed by GitHub
commit e77f24d80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4049.misc Normal file
View File

@ -0,0 +1 @@
Only colourise synctl output when attached to tty

11
synctl
View File

@ -48,7 +48,16 @@ def pid_running(pid):
def write(message, colour=NORMAL, stream=sys.stdout): def write(message, colour=NORMAL, stream=sys.stdout):
if colour == NORMAL: # Lets check if we're writing to a TTY before colouring
should_colour = False
try:
should_colour = stream.isatty()
except AttributeError:
# Just in case `isatty` isn't defined on everything. The python
# docs are incredibly vague.
pass
if not should_colour:
stream.write(message + "\n") stream.write(message + "\n")
else: else:
stream.write(colour + message + NORMAL + "\n") stream.write(colour + message + NORMAL + "\n")