diff options
| author | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-09-04 23:33:20 +0200 |
|---|---|---|
| committer | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-09-04 23:53:04 +0200 |
| commit | 06c584528f975dd03b30fc4c0a3b7fa95cbb0b6d (patch) | |
| tree | a391087741861dbc79a6e3b3f17e33c937084796 | |
| parent | 27e36ff3c64920220ce068fbf6dc392160cc1c64 (diff) | |
| download | bcfg2-06c584528f975dd03b30fc4c0a3b7fa95cbb0b6d.tar.gz bcfg2-06c584528f975dd03b30fc4c0a3b7fa95cbb0b6d.tar.bz2 bcfg2-06c584528f975dd03b30fc4c0a3b7fa95cbb0b6d.zip | |
Make database_port setting optional
Make the database_port configuration parameter optional (as documented
in doc/reports/dynamic.txt). The default port will now be used if the
database_port is not explicitly set.
| -rw-r--r-- | src/lib/Server/Reports/settings.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py index fff30d30a..869f09f1f 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Server/Reports/settings.py @@ -42,7 +42,10 @@ if db_engine != 'sqlite3': DATABASES['default']['USER'] = c.get('statistics', 'database_user') DATABASES['default']['PASSWORD'] = c.get('statistics', 'database_password') DATABASES['default']['HOST'] = c.get('statistics', 'database_host') - DATABASES['default']['PORT'] = c.get('statistics', 'database_port') + try: + DATABASES['default']['PORT'] = c.get('statistics', 'database_port') + except: # An empty string tells Django to use the default port. + DATABASES['default']['PORT'] = '' if django.VERSION[0] == 1 and django.VERSION[1] < 2: DATABASE_ENGINE = db_engine |