Merge pull request #228 from serguun42/bring-docker

Update logs
serguun42 · Nov 15, 2023 · 520030c · 520030c
2 parents 142b401 + 05cb4ef
commit 520030c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/notify-on-merge.yml b/.github/workflows/notify-on-merge.yml
@@ -18,5 +18,5 @@ jobs:
           CONFIGS_LOCATION_BASE: ${{ secrets.CONFIGS_LOCATION_BASE }}
         run: |
           source $CONFIGS_LOCATION_BASE/docker.env;
-          curl http://127.0.0.1:$NOTIFIER_PUBLISH_PORT -d "{\"error\":false,\"args\":[\"User $GITHUB_ACTOR made a pull request\",\"From branch: $GITHUB_HEAD_REF\",\"To branch: $GITHUB_BASE_REF\"],\"tag\":\"ci\"}" ||
+          curl http://127.0.0.1:$NOTIFIER_PUBLISH_PORT -d "{\"error\":false,\"args\":[\"User $GITHUB_ACTOR made a pull request\\nFrom branch: $GITHUB_HEAD_REF\\nTo branch: $GITHUB_BASE_REF\"],\"tag\":\"ci\"}" ||
           echo "Error while sending notification"
diff --git a/backend/pages/api.js b/backend/pages/api.js
@@ -403,7 +403,9 @@ module.exports = (iModuleDataObject) => {
 			break;
 
 			case "ping":
-				GlobalSendCustom(200, "pong");
+				GlobalSendCustom(200, {
+					message: "pong"
+				});
 			break;
 
 			case "logs":