summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-21 13:59:46 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-21 13:59:46 -0800
commitdbb071c8424871b6985c6b470d9eff522cdda660 (patch)
tree498a9bc84fb0242d7756569d01529e6737a19333
parent29644fe5a9cf47ae33af31b848c0edc4567f3c09 (diff)
downloadnova-dbb071c8424871b6985c6b470d9eff522cdda660.tar.gz
nova-dbb071c8424871b6985c6b470d9eff522cdda660.tar.xz
nova-dbb071c8424871b6985c6b470d9eff522cdda660.zip
fix pep8 and remove extra reference to reset
-rwxr-xr-xbin/nova-compute1
-rw-r--r--nova/flags.py3
2 files changed, 1 insertions, 3 deletions
diff --git a/bin/nova-compute b/bin/nova-compute
index e412598c2..95fa393b1 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -45,6 +45,5 @@ if __name__ == '__main__':
utils.default_flagfile()
flags.FLAGS(sys.argv)
logging.setup()
-
service.serve()
service.wait()
diff --git a/nova/flags.py b/nova/flags.py
index e2f7960ec..f64a62da9 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -29,6 +29,7 @@ import sys
import gflags
+
class FlagValues(gflags.FlagValues):
"""Extension of gflags.FlagValues that allows undefined and runtime flags.
@@ -89,8 +90,6 @@ class FlagValues(gflags.FlagValues):
self.__dict__['__stored_argv'] = original_argv
self.__dict__['__was_already_parsed'] = True
self.ClearDirty()
- from nova import log as logging
- logging.reset()
return args
def Reset(self):