Bug Fix: Crasher in monitoring subsystem when storage transactions are disabled. Fixes #220.

Author: jhuckaby

lib/monitor.js

@@ -589,11 +589,17 @@ class Monitoring {
 		var update_data = null;
 		var last_item = null;
 		var trans = null;
+		var use_trans = !!this.config.getPath('Storage.transactions');
 
 		async.series(
 			[
 				function(callback) {
-					// begin transaction
+					// begin transaction if enabled, otherwise use direct storage
+					if (!use_trans) {
+						trans = self.storage;
+						return callback();
+					}
+					
 					self.storage.begin( timeline_key, function(err, transaction) {
 						trans = transaction;
 						callback();
@@ -684,12 +690,15 @@ class Monitoring {
 				},
 				function(callback) {
 					// commit our transaction
+					if (!use_trans) return callback();
 					trans.commit(callback);
 				}
 			],
 			function(err) {
 				if (err) {
 					// abort transaction and bubble error up
+					if (!use_trans) return callback(err);
+					
 					return trans.abort( function() {
 						callback(err);
 					} );