1
=== modified file 'hooks/hooks.py'
2
--- hooks/hooks.py	2016-02-26 14:00:17 +0000
3
+++ hooks/hooks.py	2016-07-20 21:43:43 +0000
4
@@ -862,7 +862,7 @@
5
862
862
6
863
863
7
864
def backup_cronjob(disable=False):
864
def backup_cronjob(disable=False):
9
865
    """Generate the cronjob to backup with mongodbump."""
865
    """Generate the cronjob to backup with mongodump."""
10
866
    juju_log('Setting up cronjob')
866
    juju_log('Setting up cronjob')
11
867
    config_data = config()
867
    config_data = config()
12
868
    backupdir = config_data['backup_directory']
868
    backupdir = config_data['backup_directory']
13
869
869
14
=== modified file 'templates/backup.py.tpl'
15
--- templates/backup.py.tpl	2013-04-25 15:58:45 +0000
16
+++ templates/backup.py.tpl	2016-07-20 21:43:43 +0000
17
@@ -1,6 +1,7 @@
18
1
#!/usr/bin/env python
1
#!/usr/bin/env python
20
2
"""Generate the cronjob to backup with mongodbump."""
2
"""Generate the cronjob to backup with mongodump."""
21
3
3
22
4
import logging
23
4
from os import chdir
5
from os import chdir
24
5
from os import listdir
6
from os import listdir
25
6
from os import remove
7
from os import remove
26
@@ -11,6 +12,9 @@
27
11
import subprocess
12
import subprocess
28
12
from tempfile import mkdtemp
13
from tempfile import mkdtemp
29
13
14
30
15
logging.basicConfig()
31
16
# use backup.py as logger name because __name__ will be __main__
32
17
logger = logging.getLogger('backup.py')
33
14
18
34
15
when = datetime.now()
19
when = datetime.now()
35
16
backupdir = '$backup_directory'
20
backupdir = '$backup_directory'
36
@@ -28,7 +32,11 @@
37
28
current_backups = listdir(backupdir)
32
current_backups = listdir(backupdir)
38
29
current_backups.sort()
33
current_backups.sort()
39
30
for file in current_backups[0:-$backup_copies]:
34
for file in current_backups[0:-$backup_copies]:
41
31
    remove(join(backupdir, file))
35
    fname = join(backupdir, file)
42
36
    try:
43
37
        remove(fname)
44
38
    except Exception as e:
45
39
        logger.warning("could not remove %s:%s", fname, e)
46
32
40
47
33
chdir(tmpdir)
41
chdir(tmpdir)
48
34
42
Reviewer	Review Type	Date Requested	Status
Stuart Bishop (community)			Approve on 2017-03-06
Brad Crittenden (community)			Approve on 2017-02-28
Cory Johns (community)		2016-07-20	Needs Information on 2016-08-25
Review Queue (community)	automated testing		Needs Fixing on 2016-07-31
Marco Ceppi		2016-08-25	Pending
Charles Butler		2016-08-25	Pending
Review via email: mp+300671@code.launchpad.net