From fe4334d6c407fe1598155009a4d756dbd3e0f8b7 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Wed, 24 Jul 2019 15:33:13 -0700
Subject: [PATCH] BUGZ-829 fix a few nits

---
 domain-server/resources/web/content/js/content.js | 3 +--
 domain-server/src/AssetsBackupHandler.cpp         | 4 ++--
 domain-server/src/DomainContentBackupManager.cpp  | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 13cd9c8e29..3e2b10e3f3 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -249,7 +249,6 @@ $(document).ready(function(){
       url: '/api/backups',
       cache: false
     }).done(function(data) {
-console.log(data);
       // split the returned data into manual and automatic manual backups
       var splitBackups = _.partition(data.backups, function(value, index) {
         return value.isManualBackup;
@@ -265,7 +264,7 @@ console.log(data);
           confirmButtonText: "Restart",
           closeOnConfirm: true,
         },
-        function() {
+        function () {
           $.get("/restart");
           showRestartModal();
         });
diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 2beb057e07..36bd00718e 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -240,12 +240,12 @@ void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
-        qCWarning(asset_backup) << "There is already an operation in progress.  Please wait.";
+        qCWarning(asset_backup) << "There is already an operation in progress.";
         return;
     }
 
     if (_assetServerEnabled && _lastMappingsRefresh.time_since_epoch().count() == 0) {
-        qCWarning(asset_backup) << "Current mappings not yet loaded.  Please wait.";
+        qCWarning(asset_backup) << "Current mappings not yet loaded.";
         _backups.emplace_back(backupName, AssetUtils::Mappings(), true);
         return;
     }
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 4f4490ebee..67a53cd1d4 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -173,6 +173,8 @@ bool DomainContentBackupManager::process() {
                 return handler->getRecoveryStatus().first;
             });
 
+            // if an error occurred, don't restart the server so that the user
+            // can be notified of the error and take action.
             if (!isStillRecovering && _recoveryError.isEmpty()) {
                 _isRecovering = false;
                 _recoveryFilename = "";