External/CoreControl
1
0
Fork 0
mirror of https://github.com/crocofied/CoreControl.git synced 2025-12-18 16:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix uptime check crash error

Browse Source
This commit is contained in:
headlessdev 2025-04-18 11:29:14 +02:00
parent 547212cd9e
commit 60dd711856
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
agent/main.go
View File

@ -190,27 +190,43 @@ 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) {
var notificationTemplate string var notificationTemplate string
err := db.QueryRow("SELECT notification_text FROM settings LIMIT 1").Scan(&notificationTemplate) err := db.QueryRow("SELECT notification_text FROM settings LIMIT 1").Scan(&notificationTemplate)
if err != nil { if err != nil || notificationTemplate == "" {
notificationTemplate = "The application '!name' (!url) went !status!" notificationTemplate = "The application '!name' (!url) went !status!"
} }
for _, app := range apps { for _, app := range apps {
logPrefix := fmt.Sprintf("[App %s (%s)]", app.Name, app.PublicURL)
fmt.Printf("%s Checking...\n", logPrefix)
httpCtx, httpCancel := context.WithTimeout(context.Background(), 4*time.Second) httpCtx, httpCancel := context.WithTimeout(context.Background(), 4*time.Second)
req, err := http.NewRequestWithContext(httpCtx, "GET", app.PublicURL, nil) req, err := http.NewRequestWithContext(httpCtx, "HEAD", app.PublicURL, nil)
if err != nil { if err != nil {
fmt.Printf("%s Request creation failed: %v\n", logPrefix, err)
httpCancel() httpCancel()
continue continue
} }
resp, err := client.Do(req) resp, err := client.Do(req)
httpCancel()
var isOnline bool if err != nil || (resp != nil && (resp.StatusCode == http.StatusMethodNotAllowed || resp.StatusCode == http.StatusNotImplemented)) {
if err == nil { if resp != nil && resp.Body != nil {
isOnline = resp.StatusCode >= 200 && resp.StatusCode < 300 ||
resp.StatusCode == 405
resp.Body.Close() resp.Body.Close()
} }
fmt.Printf("%s HEAD failed, trying GET...\n", logPrefix)
req.Method = "GET"
resp, err = client.Do(req)
}
var isOnline bool
if err == nil && resp != nil {
isOnline = (resp.StatusCode >= 200 && resp.StatusCode < 300) || resp.StatusCode == 405
resp.Body.Close()
} else {
fmt.Printf("%s HTTP error: %v\n", logPrefix, err)
}
httpCancel()
if isOnline != app.Online { if isOnline != app.Online {
status := "offline" status := "offline"
@ -231,20 +247,20 @@ func checkAndUpdateStatus(db *sql.DB, client *http.Client, apps []Application) {
`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("Error updating application %d: %v\n", app.ID, err) fmt.Printf("%s DB update failed: %v\n", logPrefix, err)
} }
dbCancel()
dbCtx2, dbCancel2 := context.WithTimeout(context.Background(), 5*time.Second) dbCtx2, dbCancel2 := context.WithTimeout(context.Background(), 5*time.Second)
_, err = db.ExecContext(dbCtx2, _, 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("Error uptime_history %d: %v\n", app.ID, err) fmt.Printf("%s Insert into history failed: %v\n", logPrefix, err)
} }
dbCancel2()
} }
} }