summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-server
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-24 14:12:07 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-25 11:58:48 -0400
commit47aebb16f15fe6f8ce29d8c6b105f10d8d64c295 (patch)
tree82b5fb2e640875a2013498b08f2cf114f3f36eb4 /src/sbin/bcfg2-server
parent3428eab79ab21d1ecee6d2f8edff083a2cccdf79 (diff)
downloadbcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.tar.gz
bcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.tar.bz2
bcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.zip
more pylint checks
Diffstat (limited to 'src/sbin/bcfg2-server')
-rwxr-xr-xsrc/sbin/bcfg2-server9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index fe16866cf..8322edeaa 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -9,9 +9,9 @@ import Bcfg2.Logger
import Bcfg2.Options
from Bcfg2.Server.Core import CoreInitError
-logger = logging.getLogger('bcfg2-server')
+LOGGER = logging.getLogger('bcfg2-server')
-if __name__ == '__main__':
+def main():
optinfo = dict()
optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
@@ -41,9 +41,12 @@ if __name__ == '__main__':
core.run()
except CoreInitError:
msg = sys.exc_info()[1]
- logger.error(msg)
+ LOGGER.error(msg)
sys.exit(1)
except KeyboardInterrupt:
sys.exit(1)
sys.exit(0)
+
+if __name__ == '__main__':
+ sys.exit(main())