RockefellerArchiveCenter#170: set cron returns to recent string values

Author: ctgraham

indexer/cron.py

@@ -5,14 +5,15 @@
 from .indexers import Indexer
 from .models import IndexRun
 
+import json
 
 class BaseCron(CronJobBase):
     RUN_EVERY_MINS = 0
     schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
     clean = False
 
     def do(self):
-        result = False
+        result = ''
         start = datetime.now()
         action = "Full" if self.clean else "Incremental"
         object_type = self.object_type if self.object_type else "all"
@@ -21,11 +22,12 @@ def do(self):
         try:
             indexed = Indexer().add(object_type=self.object_type, clean=self.clean)
         except Exception as e:
+            result = str(e)
             print(e)
         end = datetime.now()
         print("{} records indexed in {}".format(len(indexed), end - start))
-        print("{} index of {} records complete at {}\n".format(action, object_type, end))
-        result = True
+        result = "{} index of {} records complete at {}\n".format(action, object_type, end)
+        print(result)
         return result
 
 
@@ -92,7 +94,10 @@ class CleanUpCompleted(CronJobBase):
 
     def do(self):
         try:
-            return IndexRun.objects.filter(indexrunerror__isnull=True, status=IndexRun.FINISHED).delete()
+            retval = IndexRun.objects.filter(indexrunerror__isnull=True, status=IndexRun.FINISHED).delete()
+            result = json.dumps(retval)
         except Exception as e:
-            print("Error cleaning up completed IndexRun objects: {}".format(e))
-            return False
+            result = "Error cleaning up completed IndexRun objects: {}".format(e)
+            print(result)
+        return result
+