Merge lp://staging/~joetalbott/qa-dashboard/txstatsd_pull_scripts into lp://staging/qa-dashboard

FAILED: Continuous integration, rev:677
http://10.97.0.26:8080/job/dashboard-ci/249/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/249/rebuild

51 + start_time = datetime.datetime.now()
52 + func(*args, **kwargs)
53 + end_time = datetime.datetime.now()
54 +
55 + delta = end_time - start_time
56 + ms = delta.seconds * 1000 + delta.microseconds / 1000
57 + seconds = float(ms) / 1000
58 + logging.info("ms: %s, s: %s", ms, seconds)

why not just do:

  start = time.time()
  func(*args, **kwargs)
  duration = time.time() - start

Seems like this could be its own function and be instantiated just once:

60 + statsd_client = UdpStatsDClient(TXSTATSD_HOST, TXSTATSD_PORT)
61 + metrics = ExtendedMetrics(
62 + connection=statsd_client,
63 + namespace=dashboard_metric_prefix,
64 + )
65 + statsd_client.connect()

Also - what happens when running from home? Does it just silently not hit snakefruit - if so, should we make it to where its an "opt-in" setting and we get a NULL statsd_client if its not configured?

I've always used context managers for things like this, but since they'd be going 4 indentations deep, maybe this better for this thing.

138 +@lockfile_dec(code_lock_file)
139 +@lockfile_dec(slow_lock_file, wait=True)
140 +@lockfile_dec(fast_lock_file, wait=True)
141 +@txstatsd_interval('branch_update')
142 +def branch_update():
143 + if subprocess.call(['bzr', 'missing']):
144 + subprocess.call(['bzr', 'pull'])

shouldn't this be a subprocess.check_call instead?

145 + call_command('syncdb')
146 + call_command('migrate')
147 + call_command('collectstatic', noinput=True)
148 +
149 + subprocess.call(['sudo', 'service', 'apache2', 'graceful'])

Shouldn't this be a subprocess.check_call also?

I think I've addressed all of Andy's comments.

FAILED: Continuous integration, rev:678
http://10.97.0.26:8080/job/dashboard-ci/250/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/250/rebuild

FAILED: Continuous integration, rev:678
http://10.97.0.26:8080/job/dashboard-ci/251/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/251/rebuild

PASSED: Continuous integration, rev:678
http://10.97.0.26:8080/job/dashboard-ci/252/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/252/rebuild

The `tree_dir` option for the target branch is not a lightweight checkout. Please ask a project administrator to resolve the issue, and try again.

The attempt to merge lp:~joetalbott/qa-dashboard/txstatsd_pull_scripts into lp:qa-dashboard failed. Below is the output from the failed tests.

ImportError: No module named txstatsd.client