Mercurial > public > sg101
changeset 569:3fe2eced1be7
Now developing on Ubuntu 12.04 with Python 2.7.
Use symbolic links for media, so add media/banners to .hgignore.
I had a syntax error in banner_tags.py that only Python 2.7 caught.
For local development, read database name from SECRETS.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2012 16:00:01 -0500 |
| parents | 7cec8d6f9581 |
| children | 0a0a069ab645 |
| files | .hgignore gpp/banners/templatetags/banner_tags.py gpp/settings/local.py |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Sat Mar 10 15:24:46 2012 -0600 +++ b/.hgignore Sun Apr 29 16:00:01 2012 -0500 @@ -7,10 +7,11 @@ *.mp3 static_serve media/avatars/users +media/badges +media/banners media/downloads +media/podcast media/potd -media/badges -media/podcast media/smiley gpp/celerybeat-schedule gpp/xapian_index
--- a/gpp/banners/templatetags/banner_tags.py Sat Mar 10 15:24:46 2012 -0600 +++ b/gpp/banners/templatetags/banner_tags.py Sun Apr 29 16:00:01 2012 -0500 @@ -53,7 +53,7 @@ if urls: try: conn.rpush(key, *urls) - except redis.RedisError: + except redis.RedisError, e: logger.error("banner_url: '%s' on rpush", e) pass
--- a/gpp/settings/local.py Sat Mar 10 15:24:46 2012 -0600 +++ b/gpp/settings/local.py Sun Apr 29 16:00:01 2012 -0500 @@ -9,7 +9,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'gremmies_portal', + 'NAME': SECRETS['DB_NAME'], 'USER': SECRETS['DB_USER'], 'PASSWORD': SECRETS['DB_PASSWORD'], },