Slight cleanup after rebase

This commit is contained in:
DaneEveritt
2022-10-16 13:34:24 -07:00
parent 37c52dd439
commit a74ea6a9ff
6 changed files with 96 additions and 30 deletions

View File

@@ -13,7 +13,6 @@ import (
"github.com/pterodactyl/wings/loggers/cli"
"github.com/pterodactyl/wings/remote"
"github.com/pterodactyl/wings/server"
"github.com/pterodactyl/wings/server/filesystem"
"github.com/spf13/cobra"
)
@@ -23,7 +22,7 @@ type MigrateVHDCommand struct {
func newMigrateVHDCommand() *cobra.Command {
return &cobra.Command{
Use: "migrate-vhd",
Use: "migrate-vhd",
Short: "migrates existing data from a directory tree into virtual hard-disks",
PreRun: func(cmd *cobra.Command, args []string) {
log.SetLevel(log.DebugLevel)
@@ -53,7 +52,7 @@ func (m *MigrateVHDCommand) Run(ctx context.Context) error {
for _, s := range m.manager.All() {
s.Log().Debug("starting migration of server contents to virtual disk...")
v := vhd.New(s.DiskSpace(), filesystem.VirtualDiskPath(s.Id()), s.Filesystem().Path())
v := vhd.New(s.DiskSpace(), vhd.DiskPath(s.ID()), s.Filesystem().Path())
s.Log().WithField("disk_image", v.Path()).Info("creating virtual disk for server")
if err := v.Allocate(ctx); err != nil {
return errors.WithStackIf(err)
@@ -125,4 +124,4 @@ func (m *MigrateVHDCommand) Run(ctx context.Context) error {
s.Log().Info("finished migration to virtual disk...")
}
return nil
}
}