@forestadmin/forest-cloud 1.3.0 → 1.3.1
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.
- package/dist/commands/logs.js +24 -10
- package/package.json +1 -1
package/dist/commands/logs.js
CHANGED
|
@@ -56,6 +56,9 @@ function validateToOption(to) {
|
|
|
56
56
|
'match a relative date (e.g. now-1d)');
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
+
function isRunningWithOptions(options) {
|
|
60
|
+
return !!(options.tail || options.from || options.to);
|
|
61
|
+
}
|
|
59
62
|
exports.default = (program, context) => {
|
|
60
63
|
const { logger, getCurrentVersion, login, getEnvironmentVariables, buildHttpServer } = context;
|
|
61
64
|
program
|
|
@@ -64,7 +67,7 @@ exports.default = (program, context) => {
|
|
|
64
67
|
' (you can also pass it with environment variable FOREST_ENV_SECRET)')
|
|
65
68
|
.option('-n, --tail <integer>', 'Number of lines to show from the end of the logs in the last hour.' +
|
|
66
69
|
' Default is 30, Max is 1000. Use from option to get older logs.')
|
|
67
|
-
.option('-f, --from <timestamp>', 'Minimum timestamp for requested logs. Default is the last
|
|
70
|
+
.option('-f, --from <timestamp>', 'Minimum timestamp for requested logs. Default is the last month (now-1M)')
|
|
68
71
|
.option('-t, --to <timestamp>', 'Maximum timestamp for requested logs. Default is now')
|
|
69
72
|
.description('Display logs of the customizations published on your agent')
|
|
70
73
|
.action((0, action_runner_1.default)(logger.spinner, async (options) => {
|
|
@@ -73,7 +76,7 @@ exports.default = (program, context) => {
|
|
|
73
76
|
validateToOption(options.to);
|
|
74
77
|
const { spinner } = logger;
|
|
75
78
|
const tail = Number(options.tail ?? 30);
|
|
76
|
-
const from = options.from ?? 'now-
|
|
79
|
+
const from = options.from ?? 'now-1M';
|
|
77
80
|
const to = options.to ?? 'now';
|
|
78
81
|
await (0, check_latest_version_1.default)(spinner, getCurrentVersion(), http_server_1.default.getLatestVersion);
|
|
79
82
|
const vars = await (0, shared_1.loginIfMissingAuthAndReturnEnvironmentVariables)(login, logger, getEnvironmentVariables);
|
|
@@ -106,21 +109,26 @@ exports.default = (program, context) => {
|
|
|
106
109
|
orderDetails = '- Logs are returned from the oldest to the newest';
|
|
107
110
|
message = `since "${from}"`;
|
|
108
111
|
}
|
|
109
|
-
else {
|
|
112
|
+
else if (options.to) {
|
|
110
113
|
orderDetails = '- Logs are returned from the newest to the oldest';
|
|
111
114
|
message = `until "${to}"`;
|
|
112
115
|
}
|
|
113
|
-
|
|
114
|
-
|
|
116
|
+
else {
|
|
117
|
+
orderDetails = '- Logs are returned from the newest to the oldest';
|
|
118
|
+
message = 'in the last month';
|
|
119
|
+
}
|
|
120
|
+
const helperMessage = 'To see more logs or change the time range, use --help for all options';
|
|
115
121
|
if (logs?.length > 0) {
|
|
122
|
+
logger.log('...you have probably more logs...');
|
|
116
123
|
logs.forEach(log => displayLog(logger, log));
|
|
124
|
+
if (isRunningWithOptions(options))
|
|
125
|
+
logger.log('...you have probably more logs...');
|
|
117
126
|
const pluralize = tail > 1 ? 's' : '';
|
|
118
127
|
const baseMessage = `Requested ${tail} log${pluralize} ${message} ${orderDetails}`;
|
|
119
128
|
const fromToMessage = `You have received logs from ${logs[0].timestamp} to ${logs[logs.length - 1].timestamp}`;
|
|
120
129
|
if (logs.length === tail) {
|
|
121
|
-
|
|
122
|
-
logger.log(`${helperMessage}
|
|
123
|
-
spinner.succeed(`${baseMessage}\n${fromToMessage}`);
|
|
130
|
+
spinner.succeed(`${baseMessage}\n${fromToMessage}\n`);
|
|
131
|
+
logger.log(`${helperMessage}`);
|
|
124
132
|
}
|
|
125
133
|
else {
|
|
126
134
|
spinner.succeed(`${baseMessage}, but only ${logs.length} were found\n${fromToMessage}`);
|
|
@@ -128,8 +136,14 @@ exports.default = (program, context) => {
|
|
|
128
136
|
}
|
|
129
137
|
else {
|
|
130
138
|
spinner.warn(`No logs found ${message}`);
|
|
131
|
-
|
|
139
|
+
if (!isRunningWithOptions(options)) {
|
|
140
|
+
const defaultMessage = 'By default, the last 30 logs from the past month are displayed.';
|
|
141
|
+
logger.log(`${defaultMessage} ${helperMessage}`);
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
logger.log(helperMessage);
|
|
145
|
+
}
|
|
132
146
|
}
|
|
133
147
|
}));
|
|
134
148
|
};
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9ncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb21tYW5kcy9sb2dzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsOENBQXNCO0FBRXRCLDZFQUFvRDtBQUNwRCwyRkFBaUU7QUFDakUsc0NBQTJEO0FBQzNELDZFQUcyQztBQUMzQywwRUFBaUQ7QUFDakQsc0NBQTRFO0FBRzVFLE1BQU0sVUFBVSxHQUFHO0lBQ2pCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07SUFDWixLQUFLLEVBQUUsT0FBTztDQUNmLENBQUM7QUFFRixNQUFNLFVBQVUsR0FBRyxDQUFDLE1BQWMsRUFBRSxHQUFRLEVBQUUsRUFBRTtJQUM5QyxJQUFJO1FBQ0YsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztLQUMzRDtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztLQUN4QztBQUNILENBQUMsQ0FBQztBQUVGLFNBQVMsa0JBQWtCLENBQUMsSUFBYztJQUN4QyxJQUFJLElBQUksS0FBSyxTQUFTO1FBQUUsT0FBTztJQUUvQixJQUFJLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFO1FBQy9DLE1BQU0sSUFBSSxzQkFBYSxDQUFDLDJDQUEyQyxDQUFDLENBQUM7S0FDdEU7U0FBTSxJQUFJLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFO1FBQ3ZELE1BQU0sSUFBSSxzQkFBYSxDQUFDLG1EQUFtRCxDQUFDLENB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
|