@optimizely/ocp-cli 1.0.10 → 1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -113,7 +113,7 @@ let LogsCommand = class LogsCommand {
|
|
|
113
113
|
else {
|
|
114
114
|
const spinner = new TerminalSpinner_1.TerminalSpinner().start('');
|
|
115
115
|
try {
|
|
116
|
-
await this.dumpLogs(shard, fromDate, this.printLogEntry, toDate);
|
|
116
|
+
await this.dumpLogs(shard, fromDate, this.printLogEntry, spinner, toDate);
|
|
117
117
|
}
|
|
118
118
|
finally {
|
|
119
119
|
spinner.stop();
|
|
@@ -124,12 +124,13 @@ let LogsCommand = class LogsCommand {
|
|
|
124
124
|
(0, die_1.die)((0, formatError_1.formatError)(e));
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
async dumpLogs(shard, from, cb, to) {
|
|
127
|
+
async dumpLogs(shard, from, cb, spinner, to) {
|
|
128
128
|
let count = 0;
|
|
129
129
|
const requests = this.buildRequests(from, to);
|
|
130
130
|
for (const request of requests) {
|
|
131
131
|
let result;
|
|
132
132
|
do {
|
|
133
|
+
spinner.update(chalk.gray(`Querying logs until ${request.end ? new Date(request.end).toISOString() : 'now'}`));
|
|
133
134
|
result = await Moria_1.Moria.searchLogging(request, shard);
|
|
134
135
|
result.entries.forEach(cb);
|
|
135
136
|
request.cursor = result.cursor;
|
|
@@ -155,7 +156,7 @@ let LogsCommand = class LogsCommand {
|
|
|
155
156
|
const query = async () => {
|
|
156
157
|
const end = Date.now() - TAIL_CONFIG.lagMs;
|
|
157
158
|
start = Math.min(start, end + TAIL_CONFIG.minWindowMs);
|
|
158
|
-
await this.dumpLogs(shard, start, callback, end);
|
|
159
|
+
await this.dumpLogs(shard, start, callback, spinner, end);
|
|
159
160
|
spinner.update(chalk.gray('Waiting for more logs...'));
|
|
160
161
|
setTimeout(query, TAIL_CONFIG.queryIntervalMs);
|
|
161
162
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logs.js","sourceRoot":"","sources":["../../../src/commands/app/Logs.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAE/B,mCAAsF;AACtF,mDAAkF;AAClF,uCAAkC;AAClC,+DAA0D;AAC1D,+DAA0D;AAC1D,2CAAsC;AACtC,mDAA8C;AAC9C,uDAAkD;AAIlD,IAAO,QAAQ,GAAG,aAAK,CAAC,QAAQ,CAAC;AAEjC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IAChC,mEAAmE;IACnE,8FAA8F;IAC9F,WAAW,EAAE,KAAK;IAElB,0DAA0D;IAC1D,gEAAgE;IAChE,KAAK,EAAE,KAAK;IAEZ,eAAe,EAAE,IAAI;IAErB,4BAA4B;IAC5B,eAAe,EAAE,IAAI;CACtB,CAAC,CAAC;AAEH,wCAAwC;AACxC,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,oFAAoF;AACpF,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAK9B,IAAM,WAAW,GAAjB,MAAM,WAAW;IAAjB;QA+CG,iBAAY,GAAW,EAAE,CAAC;QAuE1B,kBAAa,GAAG,CAAC,KAAe,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG;gBACd,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE;gBAClC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC7B,KAAK,CAAC,OAAO;aACd,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACjC,CAAC,CAAA;QAEO,gBAAW,GAAG,CAAC,KAAe,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,CAAC,CAAC;YAClB,QAAQ,KAAK,CAAC,WAAW,EAAE,EAAE;gBAC3B,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;oBACnB,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC5C;gBACD,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAClB,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC3C;gBACD,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAClB,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC7C;gBACD,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;oBACnB,OAAO,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC3C;gBACD;oBACE,OAAO,EAAE,CAAC;aACb;QACH,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Logs.js","sourceRoot":"","sources":["../../../src/commands/app/Logs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/commands/app/Logs.ts
CHANGED
|
@@ -145,7 +145,7 @@ export class LogsCommand {
|
|
|
145
145
|
} else {
|
|
146
146
|
const spinner = new TerminalSpinner().start('');
|
|
147
147
|
try {
|
|
148
|
-
await this.dumpLogs(shard!, fromDate, this.printLogEntry, toDate);
|
|
148
|
+
await this.dumpLogs(shard!, fromDate, this.printLogEntry, spinner, toDate);
|
|
149
149
|
} finally {
|
|
150
150
|
spinner.stop();
|
|
151
151
|
}
|
|
@@ -188,6 +188,7 @@ export class LogsCommand {
|
|
|
188
188
|
shard: Rivendell.Shard,
|
|
189
189
|
from: Date | number,
|
|
190
190
|
cb: LogEntryCallback,
|
|
191
|
+
spinner: TerminalSpinner,
|
|
191
192
|
to?: Date | number
|
|
192
193
|
): Promise<number> {
|
|
193
194
|
let count = 0;
|
|
@@ -195,6 +196,7 @@ export class LogsCommand {
|
|
|
195
196
|
for (const request of requests) {
|
|
196
197
|
let result: LoggingSearchResult;
|
|
197
198
|
do {
|
|
199
|
+
spinner.update(chalk.gray(`Querying logs until ${request.end ? new Date(request.end).toISOString() : 'now'}`));
|
|
198
200
|
result = await Moria.searchLogging(request, shard);
|
|
199
201
|
result.entries.forEach(cb);
|
|
200
202
|
request.cursor = result.cursor;
|
|
@@ -225,7 +227,7 @@ export class LogsCommand {
|
|
|
225
227
|
const query = async () => {
|
|
226
228
|
const end = Date.now() - TAIL_CONFIG.lagMs;
|
|
227
229
|
start = Math.min(start, end + TAIL_CONFIG.minWindowMs);
|
|
228
|
-
await this.dumpLogs(shard, start, callback, end);
|
|
230
|
+
await this.dumpLogs(shard, start, callback, spinner, end);
|
|
229
231
|
spinner.update(chalk.gray('Waiting for more logs...'));
|
|
230
232
|
setTimeout(query, TAIL_CONFIG.queryIntervalMs);
|
|
231
233
|
};
|