Modification to the cron methods to allow arguments to be passed to each call

This commit is contained in:
2010-10-18 12:19:22 +01:00
parent a3cbc5063c
commit ab67c55d90
5 changed files with 21 additions and 11 deletions

View File

@@ -24,7 +24,7 @@ class UpdateAPIs():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
# Update all the eve accounts and related corps # Update all the eve accounts and related corps
delta = datetime.timedelta(seconds=self.last_update_delay) delta = datetime.timedelta(seconds=self.last_update_delay)
@@ -63,7 +63,7 @@ class CorpManagementUpdate():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
directors = EVEPlayerCharacter.objects.filter(director=True) directors = EVEPlayerCharacter.objects.filter(director=True)
for director in directors: for director in directors:
@@ -85,6 +85,6 @@ class AllianceUpdate():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
alliance_import() alliance_import()

View File

@@ -14,7 +14,7 @@ class ClearStaleCache():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
objs = CachedDocument.objects.filter(cached_until__lt=datetime.utcnow()) objs = CachedDocument.objects.filter(cached_until__lt=datetime.utcnow())
self._logger.info('Removing %s stale cache documents' % objs.count()) self._logger.info('Removing %s stale cache documents' % objs.count())
objs.delete() objs.delete()
@@ -30,7 +30,7 @@ class FlushCache():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
objs = CachedDocument.objects.all() objs = CachedDocument.objects.all()
self._logger.info('Removing %s stale cache documents' % objs.count()) self._logger.info('Removing %s stale cache documents' % objs.count())
objs.delete() objs.delete()

View File

@@ -18,7 +18,7 @@ class UpdateAPIs():
last_update_delay = 604800 last_update_delay = 604800
def job(self): def job(self, args):
delta = datetime.timedelta(seconds=self.last_update_delay) delta = datetime.timedelta(seconds=self.last_update_delay)
self._logger.debug("Updating accounts older than %s" % (datetime.datetime.now() - delta)) self._logger.debug("Updating accounts older than %s" % (datetime.datetime.now() - delta))
@@ -63,7 +63,7 @@ class ProcessValidations():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
inbox = Inbox(settings.REDDIT_USER, settings.REDDIT_PASSWD) inbox = Inbox(settings.REDDIT_USER, settings.REDDIT_PASSWD)
for msg in inbox: for msg in inbox:

View File

@@ -31,7 +31,11 @@ cron_class = getattr(mod, sys.argv[2])()
log.info("Starting Job %s in %s" % (sys.argv[2], sys.argv[1])) log.info("Starting Job %s in %s" % (sys.argv[2], sys.argv[1]))
try: try:
cron_class.job() if len(sys.argv) >= 3:
args = sys.argv[3:]
else:
args = []
cron_class.job(args)
except KeyboardInterrupt: except KeyboardInterrupt:
log.error("aborting.") log.error("aborting.")

View File

@@ -19,7 +19,7 @@ class RemoveInvalidUsers():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
for user in User.objects.all(): for user in User.objects.all():
# For each user, update access list based on Corp details # For each user, update access list based on Corp details
user.get_profile().update_access() user.get_profile().update_access()
@@ -38,8 +38,14 @@ class UpdateServiceGroups():
self.__logger = logging.getLogger(__name__) self.__logger = logging.getLogger(__name__)
return self.__logger return self.__logger
def job(self): def job(self, args):
for serv in Service.objects.filter(active=1):
if args and len(args) == 1:
services = Service.objects.filter(active=1, id=args[0])
else:
services = Service.objects.filter(active=1)
for serv in services:
self._logger.info('Updating %s service' % serv) self._logger.info('Updating %s service' % serv)
api = serv.api_class api = serv.api_class
for servacc in ServiceAccount.objects.filter(active=1, service=serv): for servacc in ServiceAccount.objects.filter(active=1, service=serv):