diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-02-15 15:22:11 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-02-15 15:22:11 -0500 |
| commit | 9d9e097068abab7dc155d6614dfa8b388290bea8 (patch) | |
| tree | c2a26521e9550ff6074f2e0b853321af2234f24d /nova/flags.py | |
| parent | ce219ae1adc4b5bd761f4efe068ea5c4c494c0dc (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
Merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py index 43bc174d2..3ba3fe6fa 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -208,7 +208,7 @@ def _get_my_ip(): (addr, port) = csock.getsockname() csock.close() return addr - except socket.gaierror as ex: + except socket.error as ex: return "127.0.0.1" @@ -286,8 +286,8 @@ DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'), DEFINE_string('sql_connection', 'sqlite:///$state_path/nova.sqlite', 'connection string for sql database') -DEFINE_string('sql_idle_timeout', - '3600', +DEFINE_integer('sql_idle_timeout', + 3600, 'timeout for idle sql database connections') DEFINE_integer('sql_max_retries', 12, 'sql connection attempts') DEFINE_integer('sql_retry_interval', 10, 'sql connection retry interval') |