Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

fleetctl: add -output to journal #1416

Merged
merged 1 commit into from
Feb 10, 2016

Conversation

tixxdz
Copy link
Contributor

@tixxdz tixxdz commented Feb 1, 2016

This adds the --output flag to journal, which is passed through
to journalctl, so that you can specify its output format.

Fixes #1398

Improved-by: Djalal Harouni djalal@endocode.com

@jonboulle
Copy link
Contributor

@tixxdz my concern is that then we're still then chasing journal arguments. What about just saying that it's passed through unaltered and hence supports whatever journalctl does?

@tixxdz tixxdz force-pushed the tixxdz/fleet-01-02-2016 branch from 91bd02b to fcb0232 Compare February 2, 2016 09:57
@tixxdz
Copy link
Contributor Author

tixxdz commented Feb 2, 2016

@jonboulle yes makes sense, ok updated. Thanks!

@@ -47,6 +48,7 @@ func init() {
cmdJournal.Flags.BoolVar(&flagFollow, "f", false, "Shorthand for --follow")
cmdJournal.Flags.IntVar(&sharedFlags.SSHPort, "ssh-port", 22, "Connect to remote hosts over SSH using this TCP port")
cmdJournal.Flags.BoolVar(&flagSudo, "sudo", false, "Execute journal command with sudo")
cmdJournal.Flags.StringVar(&flagOutput, "output", "short", "Journalctl output mode")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we make this

"Output mode. This will be passed unaltered to journalctl on the remote host, and hence supports the same modes as that command."

@jonboulle
Copy link
Contributor

LGTM after one suggested change

This adds the --output flag to journal, which is passed through
to journalctl, so that you can specify its output format.

Fixes coreos#1398

Original-patch-by: Roy van de Water <roy.vwater@gmail.com>
@tixxdz tixxdz force-pushed the tixxdz/fleet-01-02-2016 branch from fcb0232 to f0549d6 Compare February 10, 2016 16:42
tixxdz added a commit that referenced this pull request Feb 10, 2016
@tixxdz tixxdz merged commit 619c85a into coreos:master Feb 10, 2016
@tixxdz tixxdz deleted the tixxdz/fleet-01-02-2016 branch March 30, 2016 08:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants