backup logs, too

Author: njl

deployment/backup-cron

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-sudo -u postgres /usr/bin/pg_dump progcom > /opt/progcom-backup/progcom-db-`date -Ihours`
+sudo -u postgres /usr/bin/pg_dump progcom > /opt/progcom-backup/db/progcom-db-`date +%Y-%m-%d_%H-%M-%S`.sql
 
-/opt/tarsnap/bin/tarsnap -c --keyfile /root/tarsnap.key --cachedir /opt/progcom-backup-cache -f progcom-db-`date +%Y-%m-%d_%H-%M-%S` /opt/progcom-backup && curl https://nosnch.in/0540fdd2ae &> /dev/null
+/opt/tarsnap/bin/tarsnap -c --keyfile /root/tarsnap.key --cachedir /opt/progcom-backup-cache -f progcom-`date +%Y-%m-%d_%H-%M-%S` /opt/progcom-backup && curl https://nosnch.in/0540fdd2ae &> /dev/null

deployment/prod.yaml

@@ -60,7 +60,8 @@
         sudo_user: postgres
 
     #Backup (Installed tarsnap by hand with `./configure #--prefix=/opt/tarsnap`)
-      - file: path=/opt/progcom-backup state=directory
+      - file: path=/opt/progcom-backup/db state=directory
+      - file: path=/opt/progcom-backup/logs state=directory
       - file: path=/opt/progcom-backup-cache state=directory
       - template: src=backup-cron dest=/etc/cron.daily/progcom-backups
                     mode=0744

deployment/web-supervisor.conf

@@ -4,4 +4,7 @@ directory=/opt/progcom
 user=nobody
 autostart=True
 autorestart=True
-stdout_logfile=/var/log/supervisor/progcom_webapp.log
+stdout_logfile=/opt/progcom-backup/logs/stdout.log
+stderr_logfile=/opt/progcom-backup/logs/stderr.log
+stderr_logfile_backups=100
+stdout_logfile_backups=100

logic.py

@@ -3,6 +3,7 @@
 import random
 import json
 import logging
+import datetime
 
 import itsdangerous
 import mandrill
@@ -21,6 +22,7 @@
 
 def l(key, **data):
     data['key'] = key
+    data['when'] = datetime.datetime.now().isoformat()+'Z'
     logger.info(json.dumps(data))