Merge lp:~paulgear/python-oops-tools/variable-retention-period into lp:python-oops-tools

[Paul Gear]

Landscape have requested longer retention for OOPSes; this is a (presently-untested) change to allow that. cRT#89955

[lp:~paulgear/python-oops-tools/variable-retention-period]

58. By Paul Gear on 2016-03-23

Specify option type

[Colin Watson (cjwatson)]

review: Approve

Unmerged revisions

58. By Paul Gear on 2016-03-23

Specify option type

57. By Paul Gear on 2016-03-23

Update documentation for --retention

56. By Paul Gear on 2016-03-23

Allow use of different retention periods

=== modified file 'src/oopstools/scripts/prune.py'
--- src/oopstools/scripts/prune.py	2012-12-05 17:30:35 +0000
+++ src/oopstools/scripts/prune.py	2016-03-23 06:47:39 +0000
@@ -53,9 +53,9 @@
         Project and projectgroup can be supplied multiple times.
 
         When run this program will ask Launchpad for OOPS references made since
-        the last date it pruned up to, with an upper limit of one week from
-        today. It then looks in the database for all oopses created during that
-        date range, and if they are not in the set returned by Launchpad,
+        the last date it pruned up to, using the upper limit specified with
+        --retention. It then looks in the database for all oopses created during
+        that date range, and if they are not in the set returned by Launchpad,
         deletes them. If the database has never been pruned before, it will
         pick the earliest date present in the repository as the start date.
 
@@ -73,6 +73,9 @@
         help="Launchpad project group to find references in.")
     parser.add_option(
         '--lpinstance', help="Launchpad instance to use", default="production")
+    parser.add_option(
+        '--retention', help="Number of days to keep OOPSes", default=7,
+        type="int")
     options, args = parser.parse_args(argv[1:])
     def needed(*optnames):
         present = set()
@@ -88,10 +91,10 @@
     needed('project', 'projectgroup')
     logging.basicConfig(
         filename='logs/prune.log', filemode='w', level=logging.DEBUG)
-    one_week = datetime.timedelta(weeks=1)
+    retention = datetime.timedelta(days=options.retention)
     one_day = datetime.timedelta(days=1)
-    # Only prune OOPS reports more than one week old.
-    prune_until = datetime.datetime.now(utc) - one_week
+    # Only prune OOPS reports older than the retention period
+    prune_until = datetime.datetime.now(utc) - retention
     # Ignore OOPS reports we already found references for - older than the last
     # prune date.
     try: