From a5b4211159dba115dacb03bb38d3934f34586978 Mon Sep 17 00:00:00 2001 From: Conner Petzold Date: Wed, 21 Feb 2018 22:02:53 -0700 Subject: [PATCH 1/2] Fix readme typo --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 76337b0f7c2..5cb06e4ce2b 100644 --- a/readme.md +++ b/readme.md @@ -252,7 +252,7 @@ All feedback and suggestions are welcome! - 📣 Stay up to date on new features and announcments on [@zeithq](https://twitter.com/zeithq). - 🔐 Subscribe to our [security](http://zeit.us12.list-manage1.com/subscribe?u=3c9e9e13d7e6dae8faf375bed&id=110e586914) mailing list to stay up-to-date on urgent security disclosures. -Please note: we adhere to the [contributor coventant](http://contributor-covenant.org/) for +Please note: we adhere to the [contributor covenant](http://contributor-covenant.org/) for all interactions in our community. #### Contributions From e7e4405e2be1c6e6decfb68824ceefdfa5520e59 Mon Sep 17 00:00:00 2001 From: Conner Petzold Date: Wed, 21 Feb 2018 22:48:15 -0700 Subject: [PATCH 2/2] Add raw output mode --- src/providers/sh/commands/logs.js | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/providers/sh/commands/logs.js b/src/providers/sh/commands/logs.js index 304612e3e28..0e44bc08510 100644 --- a/src/providers/sh/commands/logs.js +++ b/src/providers/sh/commands/logs.js @@ -47,6 +47,9 @@ const help = () => { 'UNTIL' )} Only return logs before date (ISO 8601), ignored for ${'`-f`'} -T, --team Set a custom team scope + -o ${chalk.bold.underline('MODE')}, --output=${chalk.bold.underline( + 'MODE' + )} Specify the output format (${Object.keys(logPrinters).join('|')}) [short] ${chalk.dim('Examples:')} @@ -67,6 +70,7 @@ let limit let query let follow let types +let outputMode let since let until @@ -74,14 +78,15 @@ let instanceId const main = async ctx => { argv = mri(ctx.argv.slice(2), { - string: ['query', 'since', 'until'], + string: ['query', 'since', 'until', 'output'], boolean: ['help', 'all', 'debug', 'follow'], alias: { help: 'h', all: 'a', debug: 'd', query: 'q', - follow: 'f' + follow: 'f', + output: 'o' } }) @@ -124,6 +129,7 @@ const main = async ctx => { query = argv.query || '' follow = argv.f types = argv.all ? [] : ['command', 'stdout', 'stderr', 'exit'] + outputMode = argv.output in logPrinters ? argv.output : 'short' const {authConfig: { credentials }, config: { sh }} = ctx const {token} = credentials.find(item => item.provider === 'sh') @@ -238,7 +244,7 @@ function printLogs({ token, sh: { currentTeam } }) { }) } -function printLog(log) { +function printLogShort(log) { let data const obj = log.object if (log.type === 'request') { @@ -267,6 +273,19 @@ function printLog(log) { }) } +function printLogRaw(log) { + console.log(log.object ? JSON.stringify(log.object) : log.text) +} + +const logPrinters = { + short: printLogShort, + raw: printLogRaw +} + +function printLog(log) { + logPrinters[outputMode](log) +} + async function fetchLogs({ token, currentTeam, since, until } = {}) { const now = new Now({ apiUrl, token, debug, currentTeam })