Skip to content

Open-source status page, incident response and uptime monitoring

🐛 checker (#531)

Thibault Le Ouayf1dabcfb31b4
diff --git a/apps/checker/main.go b/apps/checker/main.go
index a3e6390fb..1f5e6938f 100644
--- a/apps/checker/main.go
+++ b/apps/checker/main.go
@@ -74,7 +74,15 @@ func main() {
// Add one more retry
response, error = ping(client, u)
if error != nil {
- sendToTinybirdNew(response)
+ sendToTinybirdNew(PingData{
+ Url: u.Url,
+ Region: region,
+ Message: error.Error(),
+ CronTimestamp: u.CronTimestamp,
+ Timestamp: u.CronTimestamp,
+ MonitorId: u.MonitorId,
+ WorkspaceId: u.WorkspaceId,
+ })
if u.Status == "active" {
updateStatus(UpdateData{
MonitorId: u.MonitorId,
diff --git a/apps/checker/ping.go b/apps/checker/ping.go
index 7d8dfcb97..c3cf99a1a 100644
--- a/apps/checker/ping.go
+++ b/apps/checker/ping.go
@@ -83,7 +83,6 @@ func ping(client *http.Client, inputData InputData) (PingData, error) {
start := time.Now()
response, err := client.Do(request)
latency := time.Since(start).Milliseconds()
- defer response.Body.Close()
if err != nil {
if urlErr, ok := err.(*url.Error); ok {
@@ -102,6 +101,7 @@ func ping(client *http.Client, inputData InputData) (PingData, error) {
return PingData{}, fmt.Errorf("Error with monitor %s: %w", inputData.Url, err)
}
+ defer response.Body.Close()
_, err = io.ReadAll(response.Body)
diff --git a/apps/checker/ping_test.go b/apps/checker/ping_test.go
new file mode 100644
index 000000000..df29de1c1
--- /dev/null
+++ b/apps/checker/ping_test.go
@@ -0,0 +1,38 @@
+package main
+
+import (
+ "net/http"
+ "testing"
+)
+
+func Test_ping(t *testing.T) {
+ type args struct {
+ client *http.Client
+ inputData InputData
+ }
+ tests := []struct {
+ name string
+ args args
+ want PingData
+ wantErr bool
+ }{
+ {name: "200", args: args{client: &http.Client{}, inputData: InputData{Url: "https://openstat.us", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us", StatusCode: 200}, wantErr: false},
+ {name: "500", args: args{client: &http.Client{}, inputData: InputData{Url: "https://openstat.us/500", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us/500", StatusCode: 500}, wantErr: false},
+ {name: "500", args: args{client: &http.Client{}, inputData: InputData{Url: "https://somethingthatwillfail.ed", CronTimestamp: 1}}, want: PingData{Url: "https://openstat.us/500", StatusCode: 0}, wantErr: true},
+
+ // TODO: Add test cases.
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, err := ping(tt.args.client, tt.args.inputData)
+
+ if (err != nil) != tt.wantErr {
+ t.Errorf("ping() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+ if got.StatusCode != tt.want.StatusCode {
+ t.Errorf("ping() = %v, want %v", got, tt.want)
+ }
+ })
+ }
+}
diff --git a/apps/web/src/app/shared-metadata.ts b/apps/web/src/app/shared-metadata.ts
index 4307a15ec..adcd56010 100644
--- a/apps/web/src/app/shared-metadata.ts
+++ b/apps/web/src/app/shared-metadata.ts
@@ -1,7 +1,8 @@
import type { Metadata } from "next";
export const TITLE = "OpenStatus";
-export const DESCRIPTION = "Open-Source monitoring with incident management.";
+export const DESCRIPTION =
+ "A better way to monitor your services. Don't let your down time ruin your day.";
export const defaultMetadata: Metadata = {
title: {