enabled graceful shutdowns

Author: reggeenr

cos-to-sql/README.md

@@ -78,7 +78,8 @@ ibmcloud resource service-instance-create $SM_INSTANCE_NAME secrets-manager 7713
 
 export SM_INSTANCE_ID=$(ibmcloud resource service-instance $SM_INSTANCE_NAME --location ${REGION} --output json | jq -r '.[0] | .id')
 export SM_INSTANCE_GUID=$(ibmcloud resource service-instance $SM_INSTANCE_NAME --location ${REGION} --output json | jq -r '.[0] | .guid')
-export SECRETS_MANAGER_URL=https://$SM_INSTANCE_GUID.${REGION}.secrets-manager.appdomain.cloud
+export SECRETS_MANAGER_URL=https://${SM_INSTANCE_GUID}.${REGION}.secrets-manager.appdomain.cloud
+export SECRETS_MANAGER_URL_PRIVATE=https://${SM_INSTANCE_GUID}.private.${REGION}.secrets-manager.appdomain.cloud
 ```
 
 * Create a S2S policy "Key Manager" between SM and the DB
@@ -116,7 +117,7 @@ ibmcloud code-engine app create \
     --env COS_REGION=${REGION} \
     --env COS_TRUSTED_PROFILE_NAME=${TRUSTED_PROFILE_FOR_COS_NAME} \
     --env SM_TRUSTED_PROFILE_NAME=${TRUSTED_PROFILE_FOR_SM_NAME} \
-    --env SM_SERVICE_URL=${SECRETS_MANAGER_URL} \
+    --env SM_SERVICE_URL=${SECRETS_MANAGER_URL_PRIVATE} \
     --env SM_PG_SECRET_ID=${SM_SECRET_FOR_PG_ID}
 ```
 

cos-to-sql/app.mjs

@@ -71,6 +71,17 @@ app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')))
 const router = express.Router();
 app.use("/", router);
 
+
+//
+// Default http endpoint, which prints the list of all users in the database
+router.get("/", async (req, res) => {
+  console.log(`handling / for '${req.url}'`);
+  const pgClient = await getPgClient(secretsManager, smPgSecretId);
+  const allUsers = await listUsers(pgClient);
+  res.writeHead(200, { "Content-Type": "application/json" });
+  res.end(JSON.stringify({ users: allUsers.rows }));
+});
+
 //
 // Readiness endpoint
 router.get("/readiness", (req, res) => {
@@ -177,15 +188,6 @@ router.get("/clear", async (req, res) => {
   return;
 });
 
-//
-// Default http endpoint, which prints the list of all users in the database
-router.get("/", async (req, res) => {
-  console.log(`handling / for '${req.url}'`);
-  const pgClient = await getPgClient(secretsManager, smPgSecretId);
-  const allUsers = await listUsers(pgClient);
-  res.writeHead(200, { "Content-Type": "application/json" });
-  res.end(JSON.stringify({ users: allUsers.rows }));
-});
 
 // start server
 const port = process.env.PORT || 8080;
@@ -195,6 +197,7 @@ const server = app.listen(port, () => {
 
 process.on("SIGTERM", async () => {
   console.info("SIGTERM signal received.");
+
   await closeDBConnection();
 
   server.close(() => {

cos-to-sql/utils/db.mjs

@@ -17,42 +17,26 @@ function connectDb(connectionString, caCert) {
     };
 
     // set up a new client using our config details
-    let client = new Pool(postgreConfig);
+    let pool = new Pool({ ...postgreConfig, max: 20, idleTimeoutMillis: 5000, connectionTimeoutMillis: 2000 });
 
-    client.connect((err) => {
-      if (err) {
-        console.error(`Failed to connect to postgreSQL host '${postgreConfig.host}'`, err);
-        return reject(err);
-      }
-
-      client.query(
-        "CREATE TABLE IF NOT EXISTS users (firstname varchar(256) NOT NULL, lastname varchar(256) NOT NULL)",
-        (err, result) => {
-          if (err) {
-            console.log(`Failed to create PostgreSQL table 'users'`, err);
-            return reject(err);
-          }
-          console.log(
-            `Established PostgreSQL client connection to '${postgreConfig.host}' - user table init: ${JSON.stringify(
-              result
-            )}`
-          );
-          return resolve(client);
+    pool.query(
+      "CREATE TABLE IF NOT EXISTS users (firstname varchar(256) NOT NULL, lastname varchar(256) NOT NULL)",
+      (err, result) => {
+        if (err) {
+          console.log(`Failed to create PostgreSQL table 'users'`, err);
+          return reject(err);
         }
-      );
-    });
+        console.log(
+          `Established PostgreSQL client connection to '${postgreConfig.host}' - user table init: ${JSON.stringify(
+            result
+          )}`
+        );
+        return resolve(pool);
+      }
+    );
   });
 }
 
-export async function closeDBConnection() {
-  if (_pgPool) {
-    console.log("Draining PG pool.");
-    await _pgPool.end();
-    console.log("PG pool has drained.");
-  }
-  Promise.resolve();
-}
-
 export async function getPgClient(secretsManager, secretId) {
   const fn = "getPgClient ";
   const startTime = Date.now();
@@ -81,6 +65,10 @@ export async function getPgClient(secretsManager, secretId) {
   const pgConnectionString = res.result.credentials.connection.postgres.composed[0];
   _pgPool = await connectDb(pgConnectionString, pgCaCert);
 
+  _pgPool.on("error", (err) => {
+    console.log("Pool received an error event", err);
+  });
+
   console.log(`${fn} < done - duration ${Date.now() - startTime} ms`);
   return _pgPool;
 }
@@ -134,3 +122,11 @@ export function deleteUsers(client) {
     });
   });
 }
+
+export async function closeDBConnection() {
+  if (_pgPool) {
+    console.log("Draining PG pool...");
+    await _pgPool.end();
+    console.log("PG pool has drained.");
+  }
+}