extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-01-08 23:39:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: encapsulate pulling in a struct

Browse Source 
refs #10
This commit is contained in:
Christian Schwarz 2017-12-24 15:05:07 +01:00
parent 2716c75ad5
commit 583a63a68f
4 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cmd/config_job_control.go
View File

@ -32,17 +32,6 @@ func (j *ControlJob) JobName() string {
return j.Name
}
func (j *ControlJob) EndpointVersion(w http.ResponseWriter, r *http.Request) {
var buf bytes.Buffer
err := json.NewEncoder(&buf).Encode(NewZreplVersionInformation())
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
io.WriteString(w, err.Error())
} else {
io.Copy(w, &buf)
}
}
const (
ControlJobEndpointProfile string = "/debug/pprof/profile"
ControlJobEndpointVersion string = "/version"
@ -60,8 +49,11 @@ func (j *ControlJob) JobStart(ctx context.Context) {
}
mux := http.NewServeMux()
mux.Handle(ControlJobEndpointProfile, requestLogger{log, pprof.Profile})
mux.Handle(ControlJobEndpointVersion, requestLogger{log, j.EndpointVersion})
mux.Handle(ControlJobEndpointProfile, requestLogger{log: log, handlerFunc: pprof.Profile})
mux.Handle(ControlJobEndpointVersion,
requestLogger{log: log, handler: jsonResponder{func() (interface{}, error) {
return NewZreplVersionInformation(), nil
}}})
server := http.Server{Handler: mux}
outer:
@ -89,14 +81,42 @@ outer:
}
type jsonResponder struct {
producer func() (interface{}, error)
}
func (j jsonResponder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
res, err := j.producer()
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
io.WriteString(w, err.Error())
return
}
var buf bytes.Buffer
err = json.NewEncoder(&buf).Encode(res)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
io.WriteString(w, err.Error())
} else {
io.Copy(w, &buf)
}
}
type requestLogger struct {
log Logger
handlerFunc func(w http.ResponseWriter, r *http.Request)
handler http.Handler
handlerFunc http.HandlerFunc
}
func (l requestLogger) ServeHTTP(w http.ResponseWriter, r *http.Request) {
log := l.log.WithField("method", r.Method).WithField("url", r.URL)
log.Info("start")
l.handlerFunc(w, r)
if l.handlerFunc != nil {
l.handlerFunc(w, r)
} else if l.handler != nil {
l.handler.ServeHTTP(w, r)
} else {
log.Error("no handler or handlerFunc configured")
}
log.Info("finish")
}

4
cmd/config_job_local.go
View File

@ -137,8 +137,8 @@ outer:
{
log := pullCtx.Value(contextKeyLog).(Logger)
log.Debug("replicating from lhs to rhs")
err := doPull(PullContext{local, log, j.Mapping, j.InitialReplPolicy})
if err != nil {
puller := Puller{local, log, j.Mapping, j.InitialReplPolicy}
if err := puller.doPull(); err != nil {
log.WithError(err).Error("error replicating lhs to rhs")
}
// use a ctx as soon as doPull gains ctx support

4
cmd/config_job_pull.go
View File

@ -120,8 +120,8 @@ start:
log.Info("starting pull")
pullLog := log.WithField(logTaskField, "pull")
err = doPull(PullContext{client, pullLog, j.Mapping, j.InitialReplPolicy})
if err != nil {
puller := Puller{client, pullLog, j.Mapping, j.InitialReplPolicy}
if err = puller.doPull(); err != nil {
log.WithError(err).Error("error doing pull")
}

4
cmd/replication.go
View File

@ -52,14 +52,14 @@ func closeRPCWithTimeout(log Logger, remote rpc.RPCClient, timeout time.Duration
return
}
type PullContext struct {
type Puller struct {
Remote rpc.RPCClient
Log Logger
Mapping DatasetMapping
InitialReplPolicy InitialReplPolicy
}
func doPull(pull PullContext) (err error) {
func (pull *Puller) doPull() (err error) {
remote := pull.Remote
log := pull.Log