Skip to content

[FIX] Show stderr during build process #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[FIX] Show stderr during build process #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3daa679
[FIX] Use --logfile instead of redirecting stdout to a log file
Dec 4, 2014
8858d70
[FIX] use of old-style octal literal
Dec 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions runbot/runbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
from openerp.addons.website.models.website import slug
from openerp.addons.website_sale.controllers.main import QueryURL

DEVNULL = open(os.devnull, 'w+b')

_logger = logging.getLogger(__name__)

#----------------------------------------------------------
Expand Down Expand Up @@ -81,13 +83,13 @@ def rfind(filename, pattern):
return False

def lock(filename):
fd = os.open(filename, os.O_CREAT | os.O_RDWR, 0600)
fd = os.open(filename, os.O_CREAT | os.O_RDWR, 0o600)
fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)

def locked(filename):
result = False
try:
fd = os.open(filename, os.O_CREAT | os.O_RDWR, 0600)
fd = os.open(filename, os.O_CREAT | os.O_RDWR, 0o600)
try:
fcntl.lockf(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
except IOError:
Expand Down Expand Up @@ -697,7 +699,7 @@ def cmd(self, cr, uid, ids, context=None):

return cmd, modules

def spawn(self, cmd, lock_path, log_path, cpu_limit=None, shell=False, showstderr=False):
def spawn(self, cmd, lock_path, cpu_limit=None, **kwargs):
def preexec_fn():
os.setsid()
if cpu_limit:
Expand All @@ -709,13 +711,8 @@ def preexec_fn():
# close parent files
os.closerange(3, os.sysconf("SC_OPEN_MAX"))
lock(lock_path)
out=open(log_path,"w")
_logger.debug("spawn: %s stdout: %s", ' '.join(cmd), log_path)
if showstderr:
stderr = out
else:
stderr = open(os.devnull, 'w')
p=subprocess.Popen(cmd, stdout=out, stderr=stderr, preexec_fn=preexec_fn, shell=shell)
_logger.debug("spawn: %s", ' '.join(cmd))
p=subprocess.Popen(cmd, preexec_fn=preexec_fn, **kwargs)
return p.pid

def github_status(self, cr, uid, ids, context=None):
Expand Down Expand Up @@ -759,19 +756,25 @@ def job_10_test_base(self, cr, uid, build, lock_path, log_path):
cmd, mods = build.cmd()
if grep(build.server("tools/config.py"), "test-enable"):
cmd.append("--test-enable")
cmd += ['-d', '%s-base' % build.dest, '-i', 'base', '--stop-after-init', '--log-level=test', '--max-cron-threads=0']
return self.spawn(cmd, lock_path, log_path, cpu_limit=300)
cmd += ['-d', '%s-base' % build.dest, '-i', 'base',
'--log-level=test', '--logfile=%s' % log_path,
'--stop-after-init', '--max-cron-threads=0']
return self.spawn(cmd, lock_path, cpu_limit=300,
stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)

def job_20_test_all(self, cr, uid, build, lock_path, log_path):
build._log('test_all', 'Start test all modules')
self.pg_createdb(cr, uid, "%s-all" % build.dest)
cmd, mods = build.cmd()
if grep(build.server("tools/config.py"), "test-enable"):
cmd.append("--test-enable")
cmd += ['-d', '%s-all' % build.dest, '-i', mods, '--stop-after-init', '--log-level=test', '--max-cron-threads=0']
cmd += ['-d', '%s-all' % build.dest, '-i', mods,
'--log-level=test', '--logfile=%s' % log_path,
'--stop-after-init', '--max-cron-threads=0']
# reset job_start to an accurate job_20 job_time
build.write({'job_start': now()})
return self.spawn(cmd, lock_path, log_path, cpu_limit=2100)
return self.spawn(cmd, lock_path, cpu_limit=2100,
stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)

def job_30_run(self, cr, uid, build, lock_path, log_path):
# adjust job_end to record an accurate job_20 job_time
Expand Down Expand Up @@ -803,7 +806,7 @@ def job_30_run(self, cr, uid, build, lock_path, log_path):
# not sure, to avoid old server to check other dbs
cmd += ["--max-cron-threads", "0"]

cmd += ['-d', "%s-all" % build.dest]
cmd += ['-d', "%s-all" % build.dest, '--logfile=%s' % log_path]

if grep(build.server("tools/config.py"), "db-filter"):
if build.repo_id.nginx:
Expand All @@ -823,7 +826,8 @@ def job_30_run(self, cr, uid, build, lock_path, log_path):
# f.close()
#cmd=[self.client_web_bin_path]

return self.spawn(cmd, lock_path, log_path, cpu_limit=None, showstderr=True)
return self.spawn(cmd, lock_path, cpu_limit=None,
stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL)

def force(self, cr, uid, ids, context=None):
"""Force a rebuild"""
Expand Down