Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Print prompts and diagnostics to stderr #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Print prompts and diagnostics to stderr #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions bonfire/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

_logger = logging.getLogger(__name__)

import sys
import click
import getpass
import arrow
Expand Down Expand Up @@ -87,7 +88,7 @@ def run(host,
# A manual host configuration is used
if username is None:
username = click.prompt("Enter username for {host}:{port}".format(host=host, port=port),
default=getpass.getuser())
default=getpass.getuser(), err=True)
if tls:
scheme = "https"
else:
Expand All @@ -114,7 +115,7 @@ def run(host,

if password is None and gl_api.password is None:
password = click.prompt("Enter password for {username}@{api}".format(
username=gl_api.username, api=gl_api), hide_input=True)
username=gl_api.username, api=gl_api), hide_input=True, err=True)

if gl_api.password is None:
gl_api.password = password
Expand All @@ -132,7 +133,8 @@ def run(host,
try:
gl_api.host_tz = gl_api.host_timezone()
except:
print("Unable to retrieve timezone from server\nUsing default timezone: " + gl_api.host_tz)
print("Unable to retrieve timezone from server\nUsing default timezone: " + gl_api.host_tz,
file=sys.stderr)

# Check if the query should be retrieved from the configuration
if query[0] == ":":
Expand Down Expand Up @@ -184,10 +186,11 @@ def run(host,
if stream or (userinfo["permissions"] != ["*"] and gl_api.default_stream is None):
if not stream:
streams = gl_api.streams()["streams"]
click.echo("Please select a stream to query:")
click.echo("Please select a stream to query:", err=True)
for i, stream in enumerate(streams):
click.echo("{}: Stream '{}' (id: {})".format(i, stream["title"], stream["id"]))
i = click.prompt("Enter stream number:", type=int, default=0)
click.echo("{}: Stream '{}' (id: {})".format(i, stream["title"], stream["id"]),
err=True)
i = click.prompt("Enter stream number:", type=int, default=0, err=True)
stream = streams[i]["id"]
stream_filter = "streams:{}".format(stream)

Expand Down
3 changes: 2 additions & 1 deletion bonfire/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@author = mharder
'''

import sys
import time
import arrow
from .graylog_api import SearchRange
Expand All @@ -22,7 +23,7 @@ def run_logprint(api, query, formatter, follow=False, interval=0, latency=2, hea

time.sleep(interval / 1000.0)
except KeyboardInterrupt:
print("\nInterrupted follow mode. Exiting...")
print("\nInterrupted follow mode. Exiting...", file=sys.stderr)

else:
result = api.search(query, fetch_all=True)
Expand Down
2 changes: 1 addition & 1 deletion bonfire/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def cli_error(msg):
click.echo(click.style(msg, fg='red'))
click.echo(click.style(msg, fg='red'), err=True)
sys.exit(1)


Expand Down