From ed08c035cc1c29a33d4b13f3d87f83bb2e94fc83 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 3 Feb 2022 16:37:15 -0500
Subject: [PATCH] Explicitly uploading mongo backups

---
 ansible/roles/mongo/tasks/main.yml | 18 +++++++++---------
 utils/backups/backup_mongo.py      |  7 +++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ansible/roles/mongo/tasks/main.yml b/ansible/roles/mongo/tasks/main.yml
index b1f62b454..0f154f1e0 100644
--- a/ansible/roles/mongo/tasks/main.yml
+++ b/ansible/roles/mongo/tasks/main.yml
@@ -214,15 +214,15 @@
   tags:
     - mongo-backup
 
-- name: Add mongo starred_stories+stories backup
-  cron:
-    name: mongo starred/shared/all stories backup
-    minute: "0"
-    hour: "5"
-    job: /srv/newsblur/docker/mongo/backup_mongo.sh stories
-  when: '"db-mongo-secondary1" in inventory_hostname'
-  tags:
-    - mongo-backup
+# - name: Add mongo starred_stories+stories backup
+#   cron:
+#     name: mongo starred/shared/all stories backup
+#     minute: "0"
+#     hour: "5"
+#     job: /srv/newsblur/docker/mongo/backup_mongo.sh stories
+#   when: '"db-mongo-secondary1" in inventory_hostname'
+#   tags:
+#     - mongo-backup
 
 # Renaming a db-mongo3 to db-mongo2:
 #  - Change hostname to db-mongo2 on Digital Ocean (doctl)
diff --git a/utils/backups/backup_mongo.py b/utils/backups/backup_mongo.py
index ae8dc4fea..f795d516a 100755
--- a/utils/backups/backup_mongo.py
+++ b/utils/backups/backup_mongo.py
@@ -20,8 +20,7 @@ def main():
     for filename in filenames:
         file_path = os.path.join(BACKUP_DIR, filename)
         basename = os.path.basename(file_path)
-        key_base, key_ext = list(splitext(basename))
-        key_prefix = "".join(['backup_db_mongo/', key_base])
+        key_prefix = 'backup_db_mongo/'
         print("Uploading {0} to {1} on {2}".format(file_path, key_prefix, settings.S3_BACKUP_BUCKET))
         sys.stdout.flush()
         upload_rotate(file_path, settings.S3_BACKUP_BUCKET, key_prefix)
@@ -40,7 +39,7 @@ def upload_rotate(file_path, s3_bucket, s3_key_prefix):
     Ex file-2015-12-28.tar.bz2
     '''
     key = ''.join([s3_key_prefix, os.path.basename(file_path)])
-    logger.debug("Uploading {0} to {1}".format(file_path, key))
+    print("Uploading {0} to {1}".format(file_path, key))
     upload(file_path, s3_bucket, key)
 
     file_root, file_ext = splitext(os.path.basename(file_path))
@@ -50,7 +49,7 @@ def upload_rotate(file_path, s3_bucket, s3_key_prefix):
     if not match:
         raise Exception('File does not contain a timestamp')
     key_prefix = ''.join([s3_key_prefix, match.group('filename')])
-    logger.debug('Rotating files on S3 with key prefix {0} and extension {1}'.format(key_prefix, file_ext))
+    print('Rotating files on S3 with key prefix {0} and extension {1}'.format(key_prefix, file_ext))
     rotate(key_prefix, file_ext, s3_bucket)