Skip to content

Commit

Permalink
Merge 6a973f9 into 225f362
Browse files Browse the repository at this point in the history
  • Loading branch information
maxim-kht committed Sep 14, 2016
2 parents 225f362 + 6a973f9 commit a5b4f1d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -4,15 +4,15 @@ python:
- "2.7"
- "3.4"
env:
- DJANGO=1.7.11 DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=1.7.11 DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=1.7.11 DJANGO_SETTINGS_MODULE='settings_mysql'
- DJANGO=1.8.7 DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=1.8.7 DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=1.8.7 DJANGO_SETTINGS_MODULE='settings_mysql'
- DJANGO=1.9 DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=1.9 DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=1.9 DJANGO_SETTINGS_MODULE='settings_mysql'
- DJANGO=1.10.1 DJANGO_SETTINGS_MODULE='settings_sqllite'
- DJANGO=1.10.1 DJANGO_SETTINGS_MODULE='settings_postgres'
- DJANGO=1.10.1 DJANGO_SETTINGS_MODULE='settings_mysql'
addons:
- postgresql: "9.3"
install:
Expand Down
25 changes: 18 additions & 7 deletions django_cron/management/commands/runcrons.py
@@ -1,4 +1,3 @@
from optparse import make_option
import traceback
from datetime import timedelta

Expand All @@ -16,18 +15,30 @@


class Command(BaseCommand):
option_list = BaseCommand.option_list + (
make_option('--force', action='store_true', help='Force cron runs'),
make_option('--silent', action='store_true', help='Do not push any message on console'),
)
def add_arguments(self, parser):
parser.add_argument(
'cron_classes',
nargs='*',
)
parser.add_argument(
'--force',
action='store_true',
help='Force cron runs'
)
parser.add_argument(
'--silent',
action='store_true',
help='Do not push any message on console'
)

def handle(self, *args, **options):
"""
Iterates over all the CRON_CLASSES (or if passed in as a commandline argument)
and runs them.
"""
if args:
cron_class_names = args
cron_classes = options['cron_classes']
if cron_classes:
cron_class_names = cron_classes
else:
cron_class_names = getattr(settings, 'CRON_CLASSES', [])

Expand Down
9 changes: 4 additions & 5 deletions test_urls.py
@@ -1,10 +1,9 @@
# urls.py
from django.conf.urls import patterns, include
from django.conf.urls import include, url
from django.contrib import admin

admin.autodiscover()

urlpatterns = patterns(
'',
(r'^admin/', include(admin.site.urls)),
)
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
]

0 comments on commit a5b4f1d

Please sign in to comment.