From 80b03b904610911577d58d21d4d59de0cc93b39a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 16:09:16 -0800
Subject: [PATCH] Make backup directory in content manager const

---
 domain-server/src/DomainContentBackupManager.cpp | 13 -------------
 domain-server/src/DomainContentBackupManager.h   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 5c4d70d7ad..159d6d6e95 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -370,25 +370,12 @@ void DomainContentBackupManager::backup() {
             qCDebug(domain_server) << "Time since last backup [" << secondsSinceLastBackup << "] for rule [" << rule.name
                                     << "] exceeds backup interval [" << rule.intervalSeconds << "] doing backup now...";
 
-<<<<<<< HEAD
-            auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
-            auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
-            QuaZip zip(_backupDirectory + "/" + fileName);
-            if (!zip.open(QuaZip::mdAdd)) {
-                qDebug() << "Could not open backup archive:" << zip.getZipName();
-                qDebug() << "    ERROR:" << zip.getZipError();
-            }
-
-            for (auto& handler : _backupHandlers) {
-                handler.createBackup(zip);
-=======
             bool success;
             QString path;
             std::tie(success, path) =  createBackup(AUTOMATIC_BACKUP_PREFIX, rule.extensionFormat);
             if (!success) {
                 qCWarning(domain_server) << "Failed to create backup for" << rule.name << "at" << path;
                 continue;
->>>>>>> dd86471a42... Add backup DS APIs
             }
 
             qDebug() << "Created backup: " << path;
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 6d6f07a19e..792695acce 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -83,7 +83,7 @@ protected:
     std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
 
 private:
-    QString _backupDirectory;
+    const QString _backupDirectory;
     std::vector<BackupHandler> _backupHandlers;
     int _persistInterval { 0 };
     bool _initialLoadComplete { false };