extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-06-20 01:37:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

handler: remove PushMapping, rename PullMapping to PullACL

Browse Source
This commit is contained in:
Christian Schwarz 2017-05-20 17:39:39 +02:00
parent 3c7f782dac
commit c7161cf8e6
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/handler.go
View File

@ -8,15 +8,14 @@ import (
type Handler struct { type Handler struct {
Logger Logger Logger Logger
PushMapping zfs.DatasetMapping PullACL zfs.DatasetMapping
PullMapping zfs.DatasetMapping
} }
func (h Handler) HandleFilesystemRequest(r rpc.FilesystemRequest) (roots []zfs.DatasetPath, err error) { func (h Handler) HandleFilesystemRequest(r rpc.FilesystemRequest) (roots []zfs.DatasetPath, err error) {
h.Logger.Printf("handling fsr: %#v", r) h.Logger.Printf("handling fsr: %#v", r)
if roots, err = zfs.ZFSListMapping(h.PullMapping); err != nil { if roots, err = zfs.ZFSListMapping(h.PullACL); err != nil {
h.Logger.Printf("handle fsr err: %v\n", err) h.Logger.Printf("handle fsr err: %v\n", err)
return return
} }
@ -29,9 +28,9 @@ func (h Handler) HandleFilesystemRequest(r rpc.FilesystemRequest) (roots []zfs.D
func (h Handler) HandleFilesystemVersionsRequest(r rpc.FilesystemVersionsRequest) (versions []zfs.FilesystemVersion, err error) { func (h Handler) HandleFilesystemVersionsRequest(r rpc.FilesystemVersionsRequest) (versions []zfs.FilesystemVersion, err error) {
// allowed to request that? // allowed to request that?
if _, err = h.PullMapping.Map(r.Filesystem); err != nil { if _, err = h.PullACL.Map(r.Filesystem); err != nil {
h.Logger.Printf("filesystem: %#v\n", r.Filesystem) h.Logger.Printf("filesystem: %#v\n", r.Filesystem)
h.Logger.Printf("pull mapping: %#v\n", h.PullMapping) h.Logger.Printf("pull mapping: %#v\n", h.PullACL)
h.Logger.Printf("allowed error: %#v\n", err) h.Logger.Printf("allowed error: %#v\n", err)
return return
} }
@ -52,7 +51,7 @@ func (h Handler) HandleInitialTransferRequest(r rpc.InitialTransferRequest) (str
h.Logger.Printf("handling initial transfer request: %#v", r) h.Logger.Printf("handling initial transfer request: %#v", r)
// allowed to request that? // allowed to request that?
if _, err = h.PullMapping.Map(r.Filesystem); err != nil { if _, err = h.PullACL.Map(r.Filesystem); err != nil {
h.Logger.Printf("initial transfer request acl errror: %#v", err) h.Logger.Printf("initial transfer request acl errror: %#v", err)
return return
} }
@ -73,7 +72,7 @@ func (h Handler) HandleIncrementalTransferRequest(r rpc.IncrementalTransferReque
h.Logger.Printf("handling incremental transfer request: %#v", r) h.Logger.Printf("handling incremental transfer request: %#v", r)
// allowed to request that? // allowed to request that?
if _, err = h.PullMapping.Map(r.Filesystem); err != nil { if _, err = h.PullACL.Map(r.Filesystem); err != nil {
h.Logger.Printf("incremental transfer request acl errror: %#v", err) h.Logger.Printf("incremental transfer request acl errror: %#v", err)
return return
} }

5
cmd/main.go
View File

@ -123,8 +123,7 @@ func cmdStdinServer(c *cli.Context) (err error) {
sinkLogger := log.New(logOut, fmt.Sprintf("sink[%s] ", identity), logFlags) sinkLogger := log.New(logOut, fmt.Sprintf("sink[%s] ", identity), logFlags)
handler := Handler{ handler := Handler{
Logger: sinkLogger, Logger: sinkLogger,
PushMapping: findMapping(conf.Sinks), PullACL: findMapping(conf.PullACLs),
PullMapping: findMapping(conf.PullACLs),
} }
if err = rpc.ListenByteStreamRPC(sshByteStream, handler, sinkLogger); err != nil { if err = rpc.ListenByteStreamRPC(sshByteStream, handler, sinkLogger); err != nil {
@ -198,7 +197,7 @@ func jobPull(pull Pull, c *cli.Context, log jobrun.Logger) (err error) {
if lt, ok := pull.From.Transport.(LocalTransport); ok { if lt, ok := pull.From.Transport.(LocalTransport); ok {
lt.SetHandler(Handler{ lt.SetHandler(Handler{
Logger: log, Logger: log,
PullMapping: pull.Mapping, PullACL: pull.Mapping,
}) })
pull.From.Transport = lt pull.From.Transport = lt
log.Printf("fixing up local transport: %#v", pull.From.Transport) log.Printf("fixing up local transport: %#v", pull.From.Transport)