appengine/swarming/swarming_bot/__main__.py - Issue 1373133004: Fixes and add smoke test: hard timeout on isolated task.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/swarming/swarming_bot/main.py

Issue 1373133004: Fixes and add smoke test: hard timeout on isolated task. (Closed) Base URL: git@github.com:luci/luci-py.git@master

Patch Set: . Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: appengine/swarming/swarming_bot/__main__.py

diff --git a/appengine/swarming/swarming_bot/__main__.py b/appengine/swarming/swarming_bot/__main__.py

index 0510eeb398eb44bee9ae5686804f061d6dc89e22..b40c43bb7c8bd2f45b8a7b6b2176bf38681ea0f3 100644

--- a/appengine/swarming/swarming_bot/__main__.py

+++ b/appengine/swarming/swarming_bot/__main__.py

@@ -60,7 +60,6 @@ def CMDtask_runner(args):

def CMDstart_bot(args):

"""Starts the swarming bot."""

logging_utils.prepare_logging(os.path.join('logs', 'swarming_bot.log'))

- logging_utils.set_console_level(logging.DEBUG)

logging.info(

'importing bot_main: %s, %s', THIS_FILE, zip_package.generate_version())

from bot_code import bot_main

@@ -73,7 +72,6 @@ def CMDstart_slave(args):

"""Ill named command that actually sets up the bot then start it."""

# TODO(maruel): Rename function.

logging_utils.prepare_logging(os.path.join('logs', 'bot_config.log'))

- logging_utils.set_console_level(logging.DEBUG)

parser = optparse.OptionParser()

parser.add_option(