From d3ebda73705263bddd698d3c3792e6663b7d3daa Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 8 Apr 2019 10:43:15 -0400
Subject: [PATCH] fix: more graceful error handling and output for cli/reset

---
 src/cli/index.js | 5 ++++-
 src/cli/reset.js | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/cli/index.js b/src/cli/index.js
index a7d937d416..e92d4b6fa1 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -242,7 +242,10 @@ resetCommand
 		}
 
 		require('./reset').reset(options, function (err) {
-			if (err) { throw err; }
+			if (err) {
+				return process.exit(1);
+			}
+
 			require('../meta/build').buildAll(function (err) {
 				if (err) { throw err; }
 
diff --git a/src/cli/reset.js b/src/cli/reset.js
index 33b1f01601..1e1f9a0a50 100644
--- a/src/cli/reset.js
+++ b/src/cli/reset.js
@@ -77,8 +77,8 @@ exports.reset = function (options, callback) {
 
 	async.series([db.init].concat(tasks), function (err) {
 		if (err) {
-			winston.error('[reset] Errors were encountered during reset', err);
-			throw err;
+			winston.error('[reset] Errors were encountered during reset -- ' + err.message);
+			return callback(err);
 		}
 
 		winston.info('[reset] Reset complete');