Merge branch 'master' of https://github.com/stevenvelozo/meadow

stevenvelozo · Dec 28, 2015 · 6933b2f · 6933b2f
2 parents b187965 + 47c6d91
commit 6933b2f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {

diff --git a/source/behaviors/Meadow-Count.js b/source/behaviors/Meadow-Count.js
@@ -38,6 +38,10 @@ var meadowBehaviorCount = function(pMeadow, pQuery, fCallBack)
 		],
 		function(pError, pQuery, pCount)
 		{
+			if (pError)
+			{
+				pMeadow.fable.log.warn('Error during the count waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
+			}
 			fCallBack(pError, pQuery, pCount);
 		}
 	);

diff --git a/source/behaviors/Meadow-Create.js b/source/behaviors/Meadow-Create.js
@@ -72,7 +72,7 @@ var meadowBehaviorCreate = function(pMeadow, pQuery, fCallBack)
 		{
 			if (pError)
 			{
-				pMeadow.fable.log.warn('Error during the create waterfall', {Error:pError, Query: pQuery.query});
+				pMeadow.fable.log.warn('Error during the create waterfall', {Error:pError, Message: pError.message, Query: pQuery.query, Stack: pError.stack});
 			}
 			fCallBack(pError, pQuery, pQueryRead, pRecord);
 		}

diff --git a/source/behaviors/Meadow-Delete.js b/source/behaviors/Meadow-Delete.js
@@ -28,6 +28,10 @@ var meadowBehaviorDelete = function(pMeadow, pQuery, fCallBack)
 		],
 		function(pError, pQuery, pRecord)
 		{
+			if (pError)
+			{
+				pMeadow.fable.log.warn('Error during the delete waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
+			}
 			fCallBack(pError, pQuery, pRecord);
 		}
 	);

diff --git a/source/behaviors/Meadow-Read.js b/source/behaviors/Meadow-Read.js
@@ -43,7 +43,7 @@ var meadowBehaviorRead = function(pMeadow, pQuery, fCallBack)
 		{
 			if (pError)
 			{
-				pMeadow.fable.log.warn('Error during the read waterfall', {Error:pError, Query: pQuery.query});
+				pMeadow.fable.log.warn('Error during the read waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
 			}
 			fCallBack(pError, pQuery, pRecord);
 		}

diff --git a/source/behaviors/Meadow-Reads.js b/source/behaviors/Meadow-Reads.js
@@ -49,7 +49,7 @@ var meadowBehaviorReads = function(pMeadow, pQuery, fCallBack)
 		{
 			if (pError)
 			{
-				pMeadow.fable.log.warn('Error during the read multiple waterfall', {Error:pError, Query: pQuery.query});
+				pMeadow.fable.log.warn('Error during the read multiple waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
 			}
 			fCallBack(pError, pQuery, pRecords);
 		}

diff --git a/source/behaviors/Meadow-Update.js b/source/behaviors/Meadow-Update.js
@@ -95,7 +95,7 @@ var meadowBehaviorUpdate = function(pMeadow, pQuery, fCallBack)
 		{
 			if (pError)
 			{
-				pMeadow.fable.log.warn('Error during Update waterfall', {Error:pError, Query: pQuery.query});
+				pMeadow.fable.log.warn('Error during Update waterfall', {Error:pError, Message: pError.message, Query: pQuery.query});
 			}
 			fCallBack(pError, pQuery, pQueryRead, pRecord);
 		}