p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logging missing configuration

This commit is contained in:
urihershgc 2015-12-03 16:21:16 +02:00
parent cc266329bd
commit fa4c92c7f1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chaos_monkey/config.py
View File

@ -123,8 +123,7 @@ class Configuration(object):
command_servers = [ command_servers = [
"russian-mail-brides.com:5000", "russian-mail-brides.com:5000",
"127.0.0.1:5000", "127.0.0.1:5000"
"10.15.1.13:5000"
] ]
serialize_config = False serialize_config = False

3
chaos_monkey/main.py
View File

@ -52,7 +52,6 @@ def main():
opts, monkey_args = arg_parser.parse_known_args(sys.argv[2:]) opts, monkey_args = arg_parser.parse_known_args(sys.argv[2:])
if opts.config: if opts.config:
config_file = opts.config config_file = opts.config
print "Config file is: %s" % config_file
if os.path.isfile(config_file): if os.path.isfile(config_file):
# using print because config can also change log locations # using print because config can also change log locations
print "Loading config from %s." % config_file print "Loading config from %s." % config_file
@ -63,6 +62,8 @@ def main():
print "Configuration loaded: %r" % WormConfiguration.as_dict() print "Configuration loaded: %r" % WormConfiguration.as_dict()
except ValueError as e: except ValueError as e:
print "Error loading config, using default: %s" % e print "Error loading config, using default: %s" % e
else:
LOG.warning("Config file: %s wasn't found, using default" % config_file)
try: try:
if MONKEY_ARG == monkey_mode: if MONKEY_ARG == monkey_mode: