Skip to content

[RunAction, logging] (#159) Restored System and Server logs in VRDT OUTPUT #160

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

Merged
bcpmihail merged 4 commits into from
Oct 11, 2024
Merged

[RunAction, logging] (#159) Restored System and Server logs in VRDT OUTPUT #160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fe25e9
feat: [159] Restored System and Server logs in VRDT OUTPUT
bcpmihail Oct 10, 2024
83b5c79
update upload artifact action version
VenelinBakalov Oct 11, 2024
15f2161
fix: [159] removed obsolete Run Script WF parameter printInOutput
bcpmihail Oct 11, 2024
c1098b0
feat: [159] Added optional LogMessage origin (Server/System)
bcpmihail Oct 11, 2024
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
10 changes: 6 additions & 4 deletions extension/src/client/command/RunAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ class ActionRunner {
}

this.logger.info(`Running workflow ${RUN_SCRIPT_WORKFLOW_ID} (vRO ${this.vroVersion})`)
const supportsSysLog = semver.gt(this.vroVersion, "7.3.1")
const params = [
{
name: "script",
Expand All @@ -293,7 +292,7 @@ class ActionRunner {
name: "printInOutput",
type: "boolean",
value: {
boolean: { value: !supportsSysLog }
boolean: { value: true }
}
}
]
Expand Down Expand Up @@ -416,6 +415,9 @@ abstract class FetchSysLogsStrategy extends FetchLogsStrategy {
protected abstract getLogMessages(): Promise<LogMessage[]>

async printMessages(): Promise<void> {
if (Logger.level === "off") {
return
}
const timestamp = Date.now() - 10000 // 10sec earlier
const logs = await this.getLogMessages()
logs.forEach(logMessage => {
Expand Down Expand Up @@ -455,7 +457,7 @@ class FetchLogsPre76 extends FetchSysLogsStrategy {
return this.restClient.getWorkflowLogsPre76(
RUN_SCRIPT_WORKFLOW_ID,
this.executionToken,
"debug",
Logger.level,
this.lastTimestamp
)
}
Expand All @@ -475,7 +477,7 @@ class FetchLogsPost76 extends FetchSysLogsStrategy {
return this.restClient.getWorkflowLogsPost76(
RUN_SCRIPT_WORKFLOW_ID,
this.executionToken,
"debug",
Logger.level,
this.lastTimestamp
)
}
Expand Down
7 changes: 7 additions & 0 deletions packages/node/vrdt-common/src/logger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ export default class Logger {
}
}

/**
* Configured log level.
*/
static get level(): LogLevel {
return Logger.logLevel
}

debug(message: string, data?: any): void {
if (this.channel && Logger.logLevel === "debug") {
this.channel.debug(this.format("DEBUG", message, data))
Expand Down
3 changes: 1 addition & 2 deletions packages/node/vrdt-common/src/rest/VroRestClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,7 @@ export class VroRestClient {
"GET",
`workflows/${workflowId}/executions/${executionId}/syslogs` +
`?conditions=severity=${severity}` +
`&conditions=timestamp${encodeURIComponent(">")}${timestamp}` +
"&conditions=type=system"
`&conditions=timestamp${encodeURIComponent(">")}${timestamp}` // + "&conditions=type=system"
Copy link
Copy Markdown
Collaborator

@VenelinBakalov VenelinBakalov Oct 11, 2024

Choose a reason for hiding this comment

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

I think we can remove the commented condition, probably we won't need it anymore

)

const messages: LogMessage[] = []
Expand Down