Skip to content
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

feat/be/docker monitors, references #1139 #1150

Merged
merged 15 commits into from
Nov 14, 2024
Merged

feat/be/docker monitors, references #1139 #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
59cbd11
Add docker type to monitor model
ajhollid Nov 13, 2024
41370c8
Add check to see if existing service/method exists to logger statement
ajhollid Nov 13, 2024
2f41893
Add hanlder for Docker types
ajhollid Nov 13, 2024
61406be
Add dockerode
ajhollid Nov 13, 2024
2548742
Inject dockerode, instantiate instance
ajhollid Nov 13, 2024
b079327
remove console log
ajhollid Nov 13, 2024
5285fd3
Add docker messages
ajhollid Nov 13, 2024
922c4d3
Build docker response
ajhollid Nov 13, 2024
11b8461
safe object access
ajhollid Nov 13, 2024
34ae35e
Add db operation type for Docker type checks to statusService
ajhollid Nov 13, 2024
c17efe3
add tests
ajhollid Nov 13, 2024
7639dd2
Refactored switch statement, extracted error building
ajhollid Nov 13, 2024
b2c4395
Add more robust error handling to networkService
ajhollid Nov 13, 2024
b8f99e3
Update tests
ajhollid Nov 13, 2024
b5f67a8
Add error message for docker container not found
ajhollid Nov 13, 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
2 changes: 1 addition & 1 deletion Server/db/models/Monitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const MonitorSchema = mongoose.Schema(
type: {
type: String,
required: true,
enum: ["http", "ping", "pagespeed", "hardware"],
enum: ["http", "ping", "pagespeed", "hardware", "docker"],
},
url: {
type: String,
Expand Down
5 changes: 3 additions & 2 deletions Server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import NetworkService from "./service/networkService.js";
import axios from "axios";
import ping from "ping";
import http from "http";
import Docker from "dockerode";

// Email service and dependencies
import EmailService from "./service/emailService.js";
Expand All @@ -45,7 +46,7 @@ import NotificationService from "./service/notificationService.js";

import db from "./db/mongo/MongoDB.js";
const SERVICE_NAME = "Server";
const SHUTDOWN_TIMEOUT = 0;
const SHUTDOWN_TIMEOUT = 1000;
Copy link

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Timeout's looking kinda slim, chief! 🍝

While changing from 0 to 1000ms is an improvement, Docker operations might need more time to clean up gracefully. Consider increasing this value further.

-const SHUTDOWN_TIMEOUT = 1000;
+const SHUTDOWN_TIMEOUT = 5000; // 5 seconds to allow Docker containers to cleanup
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const SHUTDOWN_TIMEOUT = 1000;
const SHUTDOWN_TIMEOUT = 5000; // 5 seconds to allow Docker containers to cleanup


let isShuttingDown = false;
const __filename = fileURLToPath(import.meta.url);
Expand Down Expand Up @@ -130,7 +131,7 @@ const startApp = async () => {
nodemailer,
logger
);
const networkService = new NetworkService(axios, ping, logger, http);
const networkService = new NetworkService(axios, ping, logger, http, Docker);
const statusService = new StatusService(db, logger);
const notificationService = new NotificationService(emailService, db, logger);
const jobQueue = await JobQueue.createJobQueue(
Expand Down
Loading