Skip to content

Commit 5e49b87

Browse files
authored
updated monitor urls and commands to recent django (#451)
1 parent 616286f commit 5e49b87

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

djcelery/mon.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
'django.contrib.sessions',
1515
'django.contrib.admin',
1616
'django.contrib.admindocs',
17-
'djcelery')
17+
'djcelery',
18+
)
1819

1920
DEFAULTS = {'ROOT_URLCONF': 'djcelery.monproj.urls',
2021
'DATABASE_ENGINE': 'sqlite3',
@@ -25,7 +26,8 @@
2526
'BROKER_URL': 'amqp://',
2627
'SITE_ID': 1,
2728
'INSTALLED_APPS': DEFAULT_APPS,
28-
'DEBUG': strtobool(os.environ.get('DJCELERYMON_DEBUG', '0'))}
29+
'DEBUG': strtobool(os.environ.get('DJCELERYMON_DEBUG', '0'))
30+
}
2931

3032

3133
def default_settings(name='__default_settings__'):
@@ -67,7 +69,7 @@ def main(argv=sys.argv):
6769
from django.core import management
6870
setenv('CELERY_LOADER', 'default')
6971
configure()
70-
management.call_command('syncdb')
72+
management.call_command('migrate')
7173
run_monitor(argv)
7274

7375
if __name__ == '__main__':

djcelery/monproj/urls.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
from __future__ import absolute_import, unicode_literals
22

3-
try:
4-
from django.conf.urls import (patterns, include, url,
5-
handler500, handler404)
6-
except ImportError:
7-
from django.conf.urls.defaults import (patterns, include, url, # noqa
8-
handler500, handler404)
3+
from django.conf.urls import include, url
94
from django.contrib import admin
105

11-
admin.autodiscover()
126

13-
urlpatterns = patterns(
14-
'',
7+
urlpatterns = [
158
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
169
# to INSTALLED_APPS to enable admin documentation:
17-
(r'^doc/', include('django.contrib.admindocs.urls')),
10+
url(
11+
r'^doc/',
12+
include('django.contrib.admindocs.urls')
13+
),
1814

19-
(r'', include(admin.site.urls)),
20-
)
15+
url(r'', include(admin.site.urls)),
16+
]

0 commit comments

Comments
 (0)