Skip to content

Commit

Permalink
Merge pull request #1280 from mountaindude/1279
Browse files Browse the repository at this point in the history 
1279
  • Loading branch information
@mountaindude
mountaindude authored Oct 20, 2024
2 parents c289ab7 + 6054916 commit 3b1ce2f
Show file tree
Hide file tree
Showing 31 changed files with 3,604 additions and 1,018 deletions.
3 changes: 2 additions & 1 deletion .vscode/launch.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/src/butler.js",
"runtimeVersion": "20",
// "runtimeVersion": "20",
"runtimeVersion": "18",
"cwd": "${workspaceFolder}/src",
"env": {
"NODE_CONFIG_DIR": "${workspaceFolder}/src/config",
Expand Down
3,125 changes: 2,779 additions & 346 deletions package-lock.json
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@fastify/swagger": "^8.15.0",
"@fastify/swagger-ui": "^4.1.0",
"@keyvhq/core": "^2.1.1",
"@xstate/fsm": "^2.0.1",
"@xstate/fsm": "^2.1.0",
"ajv": "^8.17.1",
"ajv-keywords": "^5.1.0",
"any-base": "^1.1.0",
Expand All @@ -73,7 +73,7 @@
"fastify-healthcheck": "^4.4.0",
"fastify-plugin": "^4.5.0",
"fs-extra": "^11.2.0",
"handlebars": "^4.7.7",
"handlebars": "^4.7.8",
"http-errors": "^2.0.0",
"i": "^0.3.7",
"influx": "^5.9.3",
Expand All @@ -89,11 +89,12 @@
"ms-teams-wrapper": "^1.0.2",
"nodemailer": "^6.9.15",
"nodemailer-express-handlebars": "^6.1.2",
"npm-check": "^6.0.1",
"os": "^0.1.2",
"posthog-node": "^4.2.0",
"posthog-node": "^4.2.1",
"promise": "^8.3.0",
"qrs-interact": "^6.3.1",
"rate-limiter-flexible": "^5.0.3",
"rate-limiter-flexible": "^5.0.4",
"serializeapp": "^3.0.0",
"systeminformation": "^5.23.5",
"upath": "^2.0.1",
Expand All @@ -104,9 +105,9 @@
"xstate": "^5.18.2"
},
"devDependencies": {
"@babel/eslint-parser": "^7.25.7",
"@babel/eslint-parser": "^7.25.8",
"@babel/plugin-syntax-import-assertions": "^7.25.7",
"@eslint/js": "^9.12.0",
"@eslint/js": "^9.13.0",
"esbuild": "^0.24.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
Expand Down
2 changes: 0 additions & 2 deletions release-please-config.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"release-as": "13.0.0",
"last-release-sha": "d50886dbdca6778c3323d5e59a1107b2e141412f",
"release-type": "node",
"prerelease": false,
"draft": true,
Expand Down
3 changes: 2 additions & 1 deletion src/config/email_templates/aborted-reload-qseow.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@

<tr>
<td colspan="2">
The script log contains {{scriptLogSize}} rows in total. Here are the first ones:
The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them.<br>
Here are the first {{scriptLogHeadCount}} rows:
</td>
</tr>
<tr>
Expand Down
3 changes: 2 additions & 1 deletion src/config/email_templates/failed-reload-qscloud.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@

<tr>
<td colspan="2">
The script log contains {{scriptLogSize}} rows in total. Here are the first ones:
The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them.<br>
Here are the first {{scriptLogHeadCount}} rows:
</td>
</tr>
<tr>
Expand Down
3 changes: 2 additions & 1 deletion src/config/email_templates/failed-reload-qseow.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@

<tr>
<td colspan="2">
The script log contains {{scriptLogSize}} rows in total. Here are the first ones:
The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them.<br>
Here are the first {{scriptLogHeadCount}} rows:
</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion src/config/slack_templates/failed-reload-qscloud.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"type": "section",
"text": {
"type": "mrkdwn",
"text": "The script log contains {{scriptLogSize}} rows in total. Here are the first ones:"
"text": "The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them. Here are the first {{scriptLogHeadCount}} rows:"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/config/slack_templates/failed-reload-qseow.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"type": "section",
"text": {
"type": "mrkdwn",
"text": "The script log contains {{scriptLogSize}} characters in total. Here are the first lines:"
"text": "The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them. Here are the first {{scriptLogHeadCount}} rows:"
}
},
{
Expand All @@ -163,7 +163,7 @@
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Here are the last few lines:"
"text": "Here are the last {{scriptLogTailCount}} rows:"
}
},
{
Expand Down
27 changes: 26 additions & 1 deletion src/config/teams_templates/failed-reload-qscloud.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,31 @@
}
]
},
{
"type": "Container",
"spacing": "extraLarge",
"style": "emphasis",
"items": [
{
"type": "TextBlock",
"size": "large",
"weight": "bolder",
"text": "Beginning of script log",
"style": "heading"
},
{
"type": "TextBlock",
"size": "small",
"weight": "normal",
"text": "The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them. Here are the first {{scriptLogHeadCount}} rows:",
"style": "heading"
},
{
"type": "CodeBlock",
"codeSnippet": "{{scriptLogHead}}"
}
]
},
{
"type": "Container",
"spacing": "extraLarge",
Expand All @@ -210,7 +235,7 @@
"type": "TextBlock",
"size": "small",
"weight": "normal",
"text": "Last {{scriptLogTailCount}} rows shown. The script log contains {{scriptLogSize}} rows in total.",
"text": "Here are the last {{scriptLogTailCount}} rows:",
"style": "heading"
},
{
Expand Down
27 changes: 26 additions & 1 deletion src/config/teams_templates/failed-reload-qseow.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,31 @@
}
]
},
{
"type": "Container",
"spacing": "extraLarge",
"style": "emphasis",
"items": [
{
"type": "TextBlock",
"size": "large",
"weight": "bolder",
"text": "Beginning of script log",
"style": "heading"
},
{
"type": "TextBlock",
"size": "small",
"weight": "normal",
"text": "The script log contains {{scriptLogSizeRows}} rows in total, with {{scriptLogSizeCharacters}} characters in them. Here are the first {{scriptLogHeadCount}} rows:",
"style": "heading"
},
{
"type": "CodeBlock",
"codeSnippet": "{{scriptLogHead}}"
}
]
},
{
"type": "Container",
"spacing": "extraLarge",
Expand All @@ -206,7 +231,7 @@
"type": "TextBlock",
"size": "small",
"weight": "normal",
"text": "Last {{scriptLogTailCount}} rows shown. The script log contains {{scriptLogSize}} rows in total.",
"text": "Here are the last {{scriptLogTailCount}} rows:",
"style": "heading"
},
{
Expand Down
Loading

0 comments on commit 3b1ce2f

Please sign in to comment.