Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
typo
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Demah committed Jan 6, 2015
1 parent 8060df3 commit ed2e003
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
20 changes: 10 additions & 10 deletions django_th/management/commands/fire_th.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def handle(self, *args, **options):
run the main process
"""
default_provider.load_services()
trigger = TriggerService.objects.filter(status=True).select_related('consummer__name', 'provider__name')
trigger = TriggerService.objects.filter(status=True).select_related('consumer__name', 'provider__name')
if trigger:
for service in trigger:
# flag to know if we have to update
Expand All @@ -60,7 +60,7 @@ def handle(self, *args, **options):
status = False
# counting the new data to store to display them in the log
count_new_data = 0
# provider - the service that offer datas
# provider - the service that offer data
service_name = str(service.provider.name.name)
service_provider = default_provider.get_service(service_name)

Expand All @@ -78,7 +78,7 @@ def handle(self, *args, **options):
status = True
# run run run
else:
# 1) get the datas from the provider service
# 1) get the data from the provider service
# get a timestamp of the last triggered of the service
datas = getattr(service_provider, 'process_data')(
service.provider.token, service.id,
Expand Down Expand Up @@ -112,7 +112,7 @@ def handle(self, *args, **options):
if published is None and which_date != '':
published = which_date
# 3) check if the previous trigger is older than the
# date of the data we retreived
# date of the data we retrieved
# if yes , process the consumer

# add the TIME_ZONE settings
Expand All @@ -138,29 +138,29 @@ def handle(self, *args, **options):
# otherwise do nothing
else:
if 'title' in data:
logger.debug("data outdated skiped : [{}] {}".format(published, data['title']))
logger.debug("data outdated skipped : [{}] {}".format(published, data['title']))
else:
logger.debug("data outdated skiped : [{}] ".format(published))
logger.debug("data outdated skipped : [{}] ".format(published))

# update the date of the trigger at the end of the loop
sentance = "user: {} - provider: {} - consumer: {} - {}"
sentence = "user: {} - provider: {} - consumer: {} - {}"
if to_update:
if status:
logger.info((sentance + " - {} new data").format(
logger.info((sentence + " - {} new data").format(
service.user,
service.provider.name.name,
service.consumer.name.name,
service.description,
count_new_data))
self.update_trigger(service)
else:
logger.info((sentance + " AN ERROR OCCURS ").format(
logger.info((sentence + " AN ERROR OCCURS ").format(
service.user,
service.provider.name.name,
service.consumer.name.name,
service.description))
else:
logger.info((sentance + " nothing new").format(
logger.info((sentence + " nothing new").format(
service.user,
service.provider.name.name,
service.consumer.name.name,
Expand Down
8 changes: 4 additions & 4 deletions django_th/management/commands/fire_th_as.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ def my_consumer(self, service_consumer, token, service_id, date_triggered):
else:
if 'title' in data:
logger.debug(
"data outdated skiped : [{}] {}".format(published, data['title']))
"data outdated skipped : [{}] {}".format(published, data['title']))
else:
logger.debug(
"data outdated skiped : [{}] ".format(published))
"data outdated skipped : [{}] ".format(published))

# return the number of updates ( to be displayed in the log )
yield from q2.put(count_new_data)
Expand All @@ -159,11 +159,11 @@ def handle(self, *args, **options):
run the main process
"""
default_provider.load_services()
trigger = TriggerService.objects.filter(status=True).select_related('consummer__name', 'provider__name')
trigger = TriggerService.objects.filter(status=True).select_related('consumer__name', 'provider__name')
if trigger:
for service in trigger:

# provider - the service that offer datas
# provider - the service that offer data
service_name = str(service.provider.name.name)
service_provider = default_provider.get_service(service_name)

Expand Down
8 changes: 4 additions & 4 deletions django_th/management/commands/fire_th_trollius.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ def my_consumer(self, service_consumer, token, service_id, date_triggered):
else:
if 'title' in data:
logger.debug(
"data outdated skiped : [{}] {}".format(published, data['title']))
"data outdated skipped : [{}] {}".format(published, data['title']))
else:
logger.debug(
"data outdated skiped : [{}] ".format(published))
"data outdated skipped : [{}] ".format(published))

# return the number of updates ( to be displayed in the log )
yield From(q2.put(count_new_data))
Expand All @@ -160,11 +160,11 @@ def handle(self, *args, **options):
run the main process
"""
default_provider.load_services()
trigger = TriggerService.objects.filter(status=True).select_related('consummer__name', 'provider__name')
trigger = TriggerService.objects.filter(status=True).select_related('consumer__name', 'provider__name')
if trigger:
for service in trigger:

# provider - the service that offer datas
# provider - the service that offer data
service_name = str(service.provider.name.name)
service_provider = default_provider.get_service(service_name)

Expand Down

0 comments on commit ed2e003

Please sign in to comment.