~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/logsink.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
129
129
        return logCh
130
130
}
131
131
 
132
 
func (h *logSinkHandler) running() bool {
133
 
        select {
134
 
        case <-h.ctxt.stop():
135
 
                return false
136
 
        default:
137
 
                return true
138
 
        }
139
 
}
140
 
 
141
132
// sendError sends a JSON-encoded error response.
142
133
func (h *logSinkHandler) sendError(w io.Writer, req *http.Request, err error) {
143
134
        if err != nil {