From ec653525099a6058cc33edf6aaf9d5da73664fe7 Mon Sep 17 00:00:00 2001
From: Jovan Popovic <jocapc@gmail.com>
Date: Wed, 29 Mar 2017 23:24:33 +0200
Subject: [PATCH] Added logs in db.js

Added more logging information in /json/nodejs/todo-app/db.js
---
 .../todo-app/nodejs-express4-rest-api/db.js   | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/samples/features/json/todo-app/nodejs-express4-rest-api/db.js b/samples/features/json/todo-app/nodejs-express4-rest-api/db.js
index 5d8cddc1..c1c73dbc 100644
--- a/samples/features/json/todo-app/nodejs-express4-rest-api/db.js
+++ b/samples/features/json/todo-app/nodejs-express4-rest-api/db.js
@@ -19,12 +19,13 @@ function createRequest(query, connection) {
     var req =
         new Request(query, 
                 function (err, rowCount) {
-                    if (err) {
-                        throw err;
-                    }
-                    connection && connection.close();
+                        if (err) {
+                            console.trace(err);
+                            throw err;
+                        }
+                        connection && connection.close();
+                        console.log('Connection closed');
                 });
-
     return req;
 }
 
@@ -32,15 +33,15 @@ function stream (query, connection, output, defaultContent) {
     
     var request = query;
     if (typeof query == "string") {
-        request = this.createRequest(query, connection);
+        request = createRequest(query, connection);
     }
-    pipe(request, output, defaultContent);
-}
 
-function pipe (request, output, defaultContent) {
     var empty = true;
     request.on('row', function (columns) {
-        empty = false;
+        if(empty) {
+            console.log('Response fetched from SQL Database!');
+            empty = false;
+        }
         output.write(columns[0].value);
     });
 
@@ -50,19 +51,28 @@ function pipe (request, output, defaultContent) {
 
     request.on('doneProc', function (rowCount, more, rows) {
         _OnDone(empty, defaultContent, output);
-    }); 
+    });
+
+    executeRequest (request, connection);
 }
 
 function _OnDone(empty, defaultContent, output) { 
         if(empty) { 
             output.write(defaultContent);
+            console.log('No results from database - default content is returned.');
         } 
-        try { output.end(); } catch (err) { /* Ignore stream close error. */ }
+        try {
+            console.log('Closing Http Response output.');
+            output.end();
+        } catch (err) {  
+            console.error(err);
+        }
     }
 
 function executeRequest (request, connection) { 
         connection.on('connect', function (err) {
             if (err) {
+                console.trace(err);
                 throw err;
             }
             connection.execSql(request);
@@ -72,5 +82,4 @@ function executeRequest (request, connection) {
 module.exports.createConnection = createConnection;
 module.exports.createRequest = createRequest; 
 module.exports.executeRequest = executeRequest;
-module.exports.stream = stream;
-module.exports.pipe = pipe;
\ No newline at end of file
+module.exports.stream = stream;
\ No newline at end of file