improve error handling

Author: reggeenr

private-path-to-vpc-vsi/ce-app/go.mod

@@ -1,4 +1,4 @@
-module github.com/IBM/CodeEngine/ce-satellite-connector
+module github.com/IBM/CodeEngine/ce-private-path
 
 go 1.23.0
 

private-path-to-vpc-vsi/ce-app/main.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 
@@ -17,7 +18,7 @@ import (
 
 var dbClient = connectToDb()
 
-type Friendship struct {
+type GuestbookEntry struct {
 	Name     string `json:"name"`
 	Created  int64  `json:"created"`
 	Greeting string `json:"greeting"`
@@ -41,39 +42,49 @@ func connectToDb() *sql.DB {
 // This func will handle all incoming HTTP requests
 func HandleHTTP(w http.ResponseWriter, r *http.Request) {
 
-	friendships := []Friendship{}
+	guestbookEntries := []GuestbookEntry{}
 	var (
 		name       string
 		created_at int64
 		greeting   string
 	)
-	Debug("Fetching all friendship records ...")
-	rows, sqlErr := dbClient.Query("SELECT name, created_at, greeting FROM myfriendships")
+	Debug("Fetching all guestbook entries ...")
+	rows, sqlErr := dbClient.Query("SELECT name, created_at, greeting FROM guestbook")
 	if sqlErr != nil {
-		log.Printf("Retrieving friendship records failed - err: " + sqlErr.Error())
+		log.Printf("Retrieving guestbook entries failed - err: " + sqlErr.Error())
+		if strings.Contains(sqlErr.Error(), "dial tcp") {
+			w.WriteHeader(502)
+			fmt.Fprintf(w, "Can't reach '%s'", os.Getenv("PGHOST"))
+			return
+		}
 		w.WriteHeader(500)
+		fmt.Fprintf(w, "%s", sqlErr.Error())
+		return
 	}
 	defer rows.Close()
 	for rows.Next() {
 		err := rows.Scan(&name, &created_at, &greeting)
 		if err != nil {
-			log.Printf("Scanning friendship record failed - err: " + err.Error())
+			log.Printf("Scanning guestbook entries failed - err: " + err.Error())
 			w.WriteHeader(500)
+			fmt.Fprintf(w, "%s", err.Error())
+			return
 		}
-		log.Println("Retrieved friendship records", name, created_at, greeting)
-		friendships = append(friendships, Friendship{Name: name, Created: created_at, Greeting: greeting})
+		log.Println("Retrieved guestbook records", name, created_at, greeting)
+		guestbookEntries = append(guestbookEntries, GuestbookEntry{Name: name, Created: created_at, Greeting: greeting})
 	}
 
-	Debug("Fetched %d friendship records", len(friendships))
-	bytes, err := json.Marshal(&friendships)
+	Debug("Fetched %d guestbook entries", len(guestbookEntries))
+	bytes, err := json.Marshal(&guestbookEntries)
 	if err != nil {
 		log.Printf("Failed to marshal response - err: " + err.Error())
 		w.WriteHeader(500)
+		fmt.Fprintf(w, "%s", err.Error())
+		return
 	}
 
 	w.Header().Add("Content-Type", "application/json")
 	fmt.Fprintf(w, "%s", string(bytes))
-
 }
 
 func main() {
@@ -96,6 +107,7 @@ func main() {
 
 	<-signals
 	Debug("shutting down server")
+	dbClient.Close()
 	if err := srv.Shutdown(ctx); err != nil {
 		log.Fatalf("failed to shutdown server: %v", err)
 	}

private-path-to-vpc-vsi/ce-job/job.mjs

@@ -4,29 +4,46 @@ import { LoremIpsum } from "lorem-ipsum";
 const { Client } = pkg;
 
 console.log("Connecting to PostgreSQL instance...");
+
+const client = new Client({
+  user: process.env.PGUSER,
+  password: process.env.PGPASSWORD,
+  host: process.env.PGHOST,
+  database: process.env.PGDATABASE,
+  port: process.env.PGPORT,
+});
 try {
-  const client = new Client({
-    user: process.env.PGUSER,
-    password: process.env.PGPASSWORD,
-    host: process.env.PGHOST,
-    database: process.env.PGDATABASE,
-    port: process.env.PGPORT,
-  });
   await client.connect();
 
-  console.log("Creating myfriendships table if it does not exist...");
-  await client.query("CREATE TABLE IF NOT EXISTS myfriendships (id SERIAL PRIMARY KEY, name varchar(256) NOT NULL, created_at bigint NOT NULL, greeting text);");
+  console.log("Creating guestbook table if it does not exist...");
+  await client.query(
+    "CREATE TABLE IF NOT EXISTS guestbook (id SERIAL PRIMARY KEY, name varchar(256) NOT NULL, created_at bigint NOT NULL, greeting text);"
+  );
 
-  console.log("Writing into myfriendships table...");
-  await client.query("INSERT INTO myfriendships (name,created_at,greeting) VALUES ($1,$2,$3);", [
+  console.log("Writing into guestbook table...");
+  await client.query("INSERT INTO guestbook (name,created_at,greeting) VALUES ($1,$2,$3);", [
     process.env.HOSTNAME,
     Date.now(),
     new LoremIpsum().generateWords(5),
   ]);
 
+  if (process.env.ACTION === "cleanup") {
+    console.log("Cleaning up table content...");
+    await client.query("DELETE FROM guestbook;");
+  }
+
   await client.end();
   console.log("Done!");
 } catch (err) {
   console.error("Failed to connect to PostgreSQL instance", err);
+
+  if(client) {
+    try {
+    await client.end();
+    } catch(error) {
+      // just do it
+    }
+  }
+
   process.exit(1);
 }