Fixes #276. Finishing snapshot within __private.applyBlock.

LiskArchive · Sep 18, 2016 · b64df59 · b64df59
1 parent 1aee225
commit b64df59
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/modules/blocks.js b/modules/blocks.js
@@ -871,7 +871,15 @@ __private.applyBlock = function (block, broadcast, cb, saveBlock) {
 						} else {
 							library.bus.message('newBlock', block, broadcast);
 							// DATABASE write. Update delegates accounts
-							modules.round.tick(block, done);
+							modules.round.tick(block, function (err) {
+								if (err === 'Snapshot finished') {
+									__private.isActive = false;
+									library.logger.info(err);
+									process.emit('SIGTERM');
+								} else {
+									done(err);
+								}
+							});
 						}
 					});
 				}

diff --git a/modules/round.js b/modules/round.js
@@ -196,7 +196,7 @@ Round.prototype.tick = function (block, done) {
 		}
 	], function (err) {
 		if (scope.finishSnapshot) {
-			process.emit('SIGTERM');
+			return done('Snapshot finished');
 		} else {
 			return done(err);
 		}