x/anvil
Code Issues Proposed changes

Turning down some logging levels

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-17 22:44:11 -07:00
parent 78f3e95ff5
commit 88a29f7bb9
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/component.py
View File

@ -367,7 +367,6 @@ class PkgUninstallComponent(ComponentBase):
def _unconfigure_runners(self): def _unconfigure_runners(self):
if RUNNER_CLS_MAPPING: if RUNNER_CLS_MAPPING:
LOG.info("Unconfiguring %s runners.", len(RUNNER_CLS_MAPPING))
for (_, cls) in RUNNER_CLS_MAPPING.items(): for (_, cls) in RUNNER_CLS_MAPPING.items():
instance = cls(self.cfg, self.component_name, self.trace_dir) instance = cls(self.cfg, self.component_name, self.trace_dir)
instance.unconfigure() instance.unconfigure()
@ -505,10 +504,10 @@ class ProgramRuntime(ComponentBase):
self._get_param_map(app_name), self._get_param_map(app_name),
) )
# Configure it with the given settings # Configure it with the given settings
LOG.info("Configuring runner for program [%s]", app_name) LOG.debug("Configuring runner for program [%s]", app_name)
cfg_am = instance.configure(app_name, cfg_am = instance.configure(app_name,
(app_pth, app_dir, program_opts)) (app_pth, app_dir, program_opts))
LOG.info("Configured %s files for runner for program [%s]", LOG.debug("Configured %s files for runner for program [%s]",
cfg_am, app_name) cfg_am, app_name)
tot_am += cfg_am tot_am += cfg_am
return tot_am return tot_am
@ -528,12 +527,12 @@ class ProgramRuntime(ComponentBase):
self._get_param_map(app_name), self._get_param_map(app_name),
) )
# Start it with the given settings # Start it with the given settings
LOG.info("Starting [%s] with options [%s]", LOG.debug("Starting [%s] with options [%s]",
app_name, ", ".join(program_opts)) app_name, ", ".join(program_opts))
info_fn = instance.start(app_name, info_fn = instance.start(app_name,
(app_pth, app_dir, program_opts), (app_pth, app_dir, program_opts),
) )
LOG.info("Started [%s] details are in [%s]", app_name, info_fn) LOG.debug("Started [%s] details are in [%s]", app_name, info_fn)
# This trace is used to locate details about what to stop # This trace is used to locate details about what to stop
self.tracewriter.started_info(app_name, info_fn) self.tracewriter.started_info(app_name, info_fn)
am_started += 1 am_started += 1

2
devstack/runners/fork.py
View File

@ -181,7 +181,7 @@ class ForkRunner(base.RunnerBase):
trace_info[STDOUT_FN] = stdoutfn trace_info[STDOUT_FN] = stdoutfn
trace_info[ARGS] = json.dumps(program_args) trace_info[ARGS] = json.dumps(program_args)
tracefn = self._do_trace(fn_name, trace_info) tracefn = self._do_trace(fn_name, trace_info)
LOG.info("Forking [%s] by running command [%s]" % (app_name, program)) LOG.debug("Forking [%s] by running command [%s]" % (app_name, program))
with sh.Rooted(ROOT_GO): with sh.Rooted(ROOT_GO):
self._fork_start(program, appdir, pidfile, stdoutfn, stderrfn, *program_args) self._fork_start(program, appdir, pidfile, stdoutfn, stderrfn, *program_args)
return tracefn return tracefn

10
devstack/runners/screen.py
View File

@ -97,7 +97,7 @@ class ScreenRunner(base.RunnerBase):
mp = dict() mp = dict()
mp['SESSION_NAME'] = session_id mp['SESSION_NAME'] = session_id
mp['NAME'] = app_name mp['NAME'] = app_name
LOG.info("Stopping program running in session [%s] in window named [%s]." % (session_id, app_name)) LOG.debug("Stopping program running in session [%s] in window named [%s]." % (session_id, app_name))
kill_cmd = self._gen_cmd(CMD_KILL, mp) kill_cmd = self._gen_cmd(CMD_KILL, mp)
sh.execute(*kill_cmd, sh.execute(*kill_cmd,
shell=True, shell=True,
@ -155,13 +155,13 @@ class ScreenRunner(base.RunnerBase):
return sessions[0] return sessions[0]
def _do_screen_init(self): def _do_screen_init(self):
LOG.info("Creating a new screen session named [%s]" % (SESSION_NAME)) LOG.debug("Creating a new screen session named [%s]" % (SESSION_NAME))
session_init_cmd = self._gen_cmd(SESSION_INIT) session_init_cmd = self._gen_cmd(SESSION_INIT)
sh.execute(*session_init_cmd, sh.execute(*session_init_cmd,
shell=True, shell=True,
run_as_root=ROOT_GO, run_as_root=ROOT_GO,
env_overrides=self._get_env()) env_overrides=self._get_env())
LOG.info("Waiting %s seconds before we attempt to set the title bar for that session." % (WAIT_ONLINE_TO)) LOG.debug("Waiting %s seconds before we attempt to set the title bar for that session." % (WAIT_ONLINE_TO))
time.sleep(WAIT_ONLINE_TO) time.sleep(WAIT_ONLINE_TO)
bar_init_cmd = self._gen_cmd(BAR_INIT) bar_init_cmd = self._gen_cmd(BAR_INIT)
sh.execute(*bar_init_cmd, sh.execute(*bar_init_cmd,
@ -177,12 +177,12 @@ class ScreenRunner(base.RunnerBase):
mp['NAME'] = prog_name mp['NAME'] = prog_name
mp['CMD'] = run_cmd mp['CMD'] = run_cmd
init_cmd = self._gen_cmd(CMD_INIT, mp) init_cmd = self._gen_cmd(CMD_INIT, mp)
LOG.info("Creating a new screen window named [%s] in session [%s]" % (prog_name, session)) LOG.debug("Creating a new screen window named [%s] in session [%s]" % (prog_name, session))
sh.execute(*init_cmd, sh.execute(*init_cmd,
shell=True, shell=True,
run_as_root=ROOT_GO, run_as_root=ROOT_GO,
env_overrides=self._get_env()) env_overrides=self._get_env())
LOG.info("Waiting %s seconds before we attempt to run command [%s] in that window." % (WAIT_ONLINE_TO, run_cmd)) LOG.debug("Waiting %s seconds before we attempt to run command [%s] in that window." % (WAIT_ONLINE_TO, run_cmd))
time.sleep(WAIT_ONLINE_TO) time.sleep(WAIT_ONLINE_TO)
start_cmd = self._gen_cmd(CMD_START, mp) start_cmd = self._gen_cmd(CMD_START, mp)
sh.execute(*start_cmd, sh.execute(*start_cmd,

6
devstack/runners/upstart.py
View File

@ -63,7 +63,7 @@ class UpstartRunner(base.RunnerBase):
if component_event in self.events: if component_event in self.events:
LOG.debug("Already emitted event: %s" % (component_event)) LOG.debug("Already emitted event: %s" % (component_event))
else: else:
LOG.info("About to emit event: %s" % (component_event)) LOG.debug("About to emit event: %s" % (component_event))
cmd = EMIT_BASE_CMD + [component_event] cmd = EMIT_BASE_CMD + [component_event]
sh.execute(*cmd, run_as_root=True) sh.execute(*cmd, run_as_root=True)
self.events.add(component_event) self.events.add(component_event)
@ -104,7 +104,7 @@ class UpstartRunner(base.RunnerBase):
# https://bugs.launchpad.net/upstart/+bug/665022 # https://bugs.launchpad.net/upstart/+bug/665022
cfg_fn = sh.joinpths(CONF_ROOT, app_name + CONF_EXT) cfg_fn = sh.joinpths(CONF_ROOT, app_name + CONF_EXT)
if sh.isfile(cfg_fn): if sh.isfile(cfg_fn):
LOG.info("Upstart config file already exists: %s" % (cfg_fn)) LOG.debug("Upstart config file already exists: %s" % (cfg_fn))
return return
LOG.debug("Loading upstart template to be used by: %s" % (cfg_fn)) LOG.debug("Loading upstart template to be used by: %s" % (cfg_fn))
(_, contents) = utils.load_template('general', UPSTART_CONF_TMPL) (_, contents) = utils.load_template('general', UPSTART_CONF_TMPL)
@ -125,7 +125,7 @@ class UpstartRunner(base.RunnerBase):
if component_event in self.events: if component_event in self.events:
LOG.debug("Already emitted event: %s" % (component_event)) LOG.debug("Already emitted event: %s" % (component_event))
else: else:
LOG.info("About to emit event: %s" % (component_event)) LOG.debug("About to emit event: %s" % (component_event))
cmd = EMIT_BASE_CMD + [component_event] cmd = EMIT_BASE_CMD + [component_event]
sh.execute(*cmd, run_as_root=True) sh.execute(*cmd, run_as_root=True)
self.events.add(component_event) self.events.add(component_event)