mirror of
https://github.com/kopia/kopia.git
synced 2026-01-27 07:48:06 -05:00
c8fcae93aa
This is mostly mechanical and changes how loggers are instantiated. Logger is now associated with a context, passed around all methods, (most methods had ctx, but had to add it in a few missing places). By default Kopia does not produce any logs, but it can be overridden, either locally for a nested context, by calling ctx = logging.WithLogger(ctx, newLoggerFunc) To override logs globally, call logging.SetDefaultLogger(newLoggerFunc) This refactoring allowed removing dependency from Kopia repo and go-logging library (the CLI still uses it, though). It is now also possible to have all test methods emit logs using t.Logf() so that they show up in failure reports, which should make debugging of test failures suck less.
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strconv"
|
|
|
|
"gopkg.in/alecthomas/kingpin.v2"
|
|
|
|
"github.com/kopia/kopia/repo/blob"
|
|
"github.com/kopia/kopia/repo/blob/filesystem"
|
|
)
|
|
|
|
var options filesystem.Options
|
|
|
|
const (
|
|
defaultFileMode = 0600
|
|
defaultDirMode = 0700
|
|
)
|
|
|
|
var (
|
|
connectOwnerUID string
|
|
connectOwnerGID string
|
|
connectFileMode string
|
|
connectDirMode string
|
|
connectFlat bool
|
|
)
|
|
|
|
func connect(ctx context.Context, isNew bool) (blob.Storage, error) {
|
|
fso := options
|
|
if v := connectOwnerUID; v != "" {
|
|
fso.FileUID = getIntPtrValue(v, 10)
|
|
}
|
|
|
|
if v := connectOwnerGID; v != "" {
|
|
fso.FileGID = getIntPtrValue(v, 10)
|
|
}
|
|
|
|
fso.FileMode = getFileModeValue(connectFileMode, defaultFileMode)
|
|
fso.DirectoryMode = getFileModeValue(connectDirMode, defaultDirMode)
|
|
|
|
if connectFlat {
|
|
fso.DirectoryShards = []int{}
|
|
}
|
|
|
|
if isNew {
|
|
log(ctx).Debugf("creating directory for repository: %v dir mode: %v", fso.Path, fso.DirectoryMode)
|
|
|
|
if err := os.MkdirAll(fso.Path, fso.DirectoryMode); err != nil {
|
|
log(ctx).Warningf("unable to create directory: %v", fso.Path)
|
|
}
|
|
}
|
|
|
|
return filesystem.New(ctx, &fso)
|
|
}
|
|
|
|
func init() {
|
|
RegisterStorageConnectFlags(
|
|
"filesystem",
|
|
"a filesystem",
|
|
func(cmd *kingpin.CmdClause) {
|
|
cmd.Flag("path", "Path to the repository").Required().StringVar(&options.Path)
|
|
cmd.Flag("owner-uid", "User ID owning newly created files").PlaceHolder("USER").StringVar(&connectOwnerUID)
|
|
cmd.Flag("owner-gid", "Group ID owning newly created files").PlaceHolder("GROUP").StringVar(&connectOwnerGID)
|
|
cmd.Flag("file-mode", "File mode for newly created files (0600)").PlaceHolder("MODE").StringVar(&connectFileMode)
|
|
cmd.Flag("dir-mode", "Mode of newly directory files (0700)").PlaceHolder("MODE").StringVar(&connectDirMode)
|
|
cmd.Flag("flat", "Use flat directory structure").BoolVar(&connectFlat)
|
|
},
|
|
connect)
|
|
}
|
|
|
|
func getIntPtrValue(value string, base int) *int {
|
|
if int64Val, err := strconv.ParseInt(value, base, 32); err == nil {
|
|
intVal := int(int64Val)
|
|
return &intVal
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func getFileModeValue(value string, def os.FileMode) os.FileMode {
|
|
if uint32Val, err := strconv.ParseUint(value, 8, 32); err == nil {
|
|
return os.FileMode(uint32Val)
|
|
}
|
|
|
|
return def
|
|
}
|