pixl-server-storage 3.1.0 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-server-storage",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "A key/value/list storage component for the pixl-server framework.",
 	"author": "Joseph Huckaby <jhuckaby@gmail.com>",
 	"homepage": "https://github.com/jhuckaby/pixl-server-storage",

package/storage.js

@@ -670,6 +670,16 @@ module.exports = Class.create({
 			}
 		}; // deleteExpiredRecord
 		
+		var doEngineMaint = function() {
+			// allow engine to run maint as well
+			self.engine.runMaintenance( function() {
+				stats.elapsed_sec = Tools.timeNow() - stats.time_start;
+				self.logDebug(3, "Daily maintenance complete");
+				self.logTransaction('maint', cleanup_list_path, stats);
+				if (callback) callback();
+			} );
+		}; // finish
+		
 		this.listEach( cleanup_list_path, 
 			function(item, item_idx, callback) {
 				// delete item if still expired
@@ -705,7 +715,7 @@ module.exports = Class.create({
 				// list iteration complete
 				if (err) {
 					self.logDebug(10, "Failed to load list, skipping maintenance (probably harmless)", cleanup_list_path);
-					if (callback) callback();
+					doEngineMaint();
 				}
 				else {
 					// no error, delete list
@@ -713,15 +723,7 @@ module.exports = Class.create({
 						if (err) {
 							self.logError('maint', "Failed to delete cleanup list: " + cleanup_list_path + ": " + err);
 						}
-						
-						// allow engine to run maint as well
-						self.engine.runMaintenance( function() {
-							stats.elapsed_sec = Tools.timeNow() - stats.time_start;
-							self.logDebug(3, "Daily maintenance complete");
-							self.logTransaction('maint', cleanup_list_path, stats);
-							if (callback) callback();
-						} );
-						
+						doEngineMaint();
 					} ); // listDelete
 				} // succes
 			} // list complete

package/test/test-main.js

@@ -450,7 +450,7 @@ module.exports = {
 					test.ok( !!storageStream, "Got storage stream as 2nd arg");
 					test.ok( !!storageStream.pipe, "Storage stream has a pipe");
 					test.ok( !!streamInfo, "Info was provided as the 3rd arg");
-					test.ok( streamInfo.len == 6, "Info has correct data length");
+					test.ok( streamInfo.len == 43, "Info has correct data length (expected 43, got " + streamInfo.len + ")");
 					test.ok( streamInfo.mod > 0, "Info has a non-zero mod date");
 					
 					outStream.on('finish', function() {
@@ -497,7 +497,7 @@ module.exports = {
 					test.ok( !!storageStream, "Got storage stream as 2nd arg");
 					test.ok( !!storageStream.pipe, "Storage stream has a pipe");
 					test.ok( !!streamInfo, "Info was provided as the 3rd arg");
-					test.ok( streamInfo.len == 23, "Info has correct data length");
+					test.ok( streamInfo.len == 43, "Info has correct data length (expected 43, got " + streamInfo.len + ")");
 					test.ok( streamInfo.mod > 0, "Info has a non-zero mod date");
 					
 					outStream.on('finish', function() {
@@ -544,7 +544,7 @@ module.exports = {
 					test.ok( !!storageStream, "Got storage stream as 2nd arg");
 					test.ok( !!storageStream.pipe, "Storage stream has a pipe");
 					test.ok( !!streamInfo, "Info was provided as the 3rd arg");
-					test.ok( streamInfo.len == 10, "Info has correct data length");
+					test.ok( streamInfo.len == 43, "Info has correct data length (expected 43, got " + streamInfo.len + ")");
 					test.ok( streamInfo.mod > 0, "Info has a non-zero mod date");
 					
 					outStream.on('finish', function() {