External/CoreControl
1
0
Fork 0
mirror of https://github.com/crocofied/CoreControl.git synced 2025-12-17 15:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Application struct and update getApplications to include Name; improve HTTP request handling in checkAndUpdateStatus

Browse Source
This commit is contained in:
headlessdev 2025-04-17 16:20:24 +02:00
parent dacde7153f
commit b9fac8ddb6
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
agent/main.go
View File

@ -17,6 +17,7 @@ import (
type Application struct { type Application struct {
ID int ID int
Name string
PublicURL string PublicURL string
Online bool Online bool
} }
@ -166,7 +167,7 @@ func deleteOldEntries(db *sql.DB) error {
func getApplications(db *sql.DB) []Application { func getApplications(db *sql.DB) []Application {
rows, err := db.Query( rows, err := db.Query(
`SELECT id, "publicURL", online FROM application WHERE "publicURL" IS NOT NULL`, `SELECT id, name, "publicURL", online FROM application WHERE "publicURL" IS NOT NULL`,
) )
if err != nil { if err != nil {
fmt.Printf("Error fetching applications: %v\n", err) fmt.Printf("Error fetching applications: %v\n", err)
@ -177,7 +178,7 @@ func getApplications(db *sql.DB) []Application {
var apps []Application var apps []Application
for rows.Next() { for rows.Next() {
var app Application var app Application
if err := rows.Scan(&app.ID, &app.PublicURL, &app.Online); err != nil { if err := rows.Scan(&app.ID, &app.Name, &app.PublicURL, &app.Online); err != nil {
fmt.Printf("Error scanning row: %v\n", err) fmt.Printf("Error scanning row: %v\n", err)
continue continue
} }
@ -188,47 +189,53 @@ func getApplications(db *sql.DB) []Application {
func checkAndUpdateStatus(db *sql.DB, client *http.Client, apps []Application) { func checkAndUpdateStatus(db *sql.DB, client *http.Client, apps []Application) {
for _, app := range apps { for _, app := range apps {
// HTTP request context // — HTTP check with proper nil‑guard —
httpCtx, httpCancel := context.WithTimeout(context.Background(), 4*time.Second) httpCtx, httpCancel := context.WithTimeout(context.Background(), 4*time.Second)
defer httpCancel()
req, err := http.NewRequestWithContext(httpCtx, "GET", app.PublicURL, nil) req, err := http.NewRequestWithContext(httpCtx, "GET", app.PublicURL, nil)
if err != nil { if err != nil {
httpCancel()
fmt.Printf("Error creating request: %v\n", err) fmt.Printf("Error creating request: %v\n", err)
continue continue
} }
resp, err := client.Do(req) resp, err := client.Do(req)
isOnline := (err == nil && resp.StatusCode >= 200 && resp.StatusCode < 300) || resp.StatusCode == 405 httpCancel()
// Notify on status change var isOnline bool
if err == nil {
isOnline = resp.StatusCode >= 200 && resp.StatusCode < 300 ||
resp.StatusCode == 405
resp.Body.Close()
}
// — Notify on change —
if isOnline != app.Online { if isOnline != app.Online {
status := "offline" status := "offline"
if isOnline { if isOnline {
status = "online" status = "online"
} }
message := fmt.Sprintf("Application %d (%s) is now %s", app.ID, app.PublicURL, status) sendNotifications(
sendNotifications(message) fmt.Sprintf("The application '%s' (%s) went %s!", app.Name, app.PublicURL, status),
)
} }
// DB context // — Update DB with its own context —
dbCtx, dbCancel := context.WithTimeout(context.Background(), 5*time.Second) dbCtx, dbCancel := context.WithTimeout(context.Background(), 5*time.Second)
defer dbCancel()
// Update application status
_, err = db.ExecContext(dbCtx, _, err = db.ExecContext(dbCtx,
`UPDATE application SET online = $1 WHERE id = $2`, `UPDATE application SET online = $1 WHERE id = $2`,
isOnline, app.ID, isOnline, app.ID,
) )
dbCancel()
if err != nil { if err != nil {
fmt.Printf("Update failed for app %d: %v\n", app.ID, err) fmt.Printf("Update failed for app %d: %v\n", app.ID, err)
} }
// Insert into uptime_history dbCtx2, dbCancel2 := context.WithTimeout(context.Background(), 5*time.Second)
_, err = db.ExecContext(dbCtx, _, err = db.ExecContext(dbCtx2,
`INSERT INTO uptime_history ("applicationId", online, "createdAt") VALUES ($1, $2, now())`, `INSERT INTO uptime_history("applicationId", online, "createdAt") VALUES ($1, $2, now())`,
app.ID, isOnline, app.ID, isOnline,
) )
dbCancel2()
if err != nil { if err != nil {
fmt.Printf("Insert into uptime_history failed for app %d: %v\n", app.ID, err) fmt.Printf("Insert into uptime_history failed for app %d: %v\n", app.ID, err)
} }