jkaninda/pg-bkup
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge pull request #122 from jkaninda/storage

Browse Source 
chore: clean up
This commit is contained in:
Jonas Kaninda
2024-10-22 17:23:37 +02:00
committed by GitHub
parent a5414b0829 49d3ffe6b2
commit e91df95979
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/restore.go
View File

@@ -82,10 +82,6 @@ func restoreFromS3(db *dbConfig, conf *RestoreConfig) {
} }
func restoreFromRemote(db *dbConfig, conf *RestoreConfig) { func restoreFromRemote(db *dbConfig, conf *RestoreConfig) {
utils.Info("Restore database from remote server") utils.Info("Restore database from remote server")
//err := CopyFromRemote(conf.file, conf.remotePath)
//if err != nil {
// utils.Fatal("Error download file from remote server: %s %v", filepath.Join(conf.remotePath, conf.file), err)
//}
sshConfig, err := loadSSHConfig() sshConfig, err := loadSSHConfig()
if err != nil { if err != nil {
utils.Fatal("Error loading ssh config: %s", err) utils.Fatal("Error loading ssh config: %s", err)
@@ -110,10 +106,6 @@ func restoreFromRemote(db *dbConfig, conf *RestoreConfig) {
} }
func restoreFromFTP(db *dbConfig, conf *RestoreConfig) { func restoreFromFTP(db *dbConfig, conf *RestoreConfig) {
utils.Info("Restore database from FTP server") utils.Info("Restore database from FTP server")
//err := CopyFromFTP(conf.file, conf.remotePath)
//if err != nil {
// utils.Fatal("Error download file from FTP server: %s %v", filepath.Join(conf.remotePath, conf.file), err)
//}
ftpConfig := loadFtpConfig() ftpConfig := loadFtpConfig()
ftpStorage, err := ftp.NewStorage(ftp.Config{ ftpStorage, err := ftp.NewStorage(ftp.Config{
Host: ftpConfig.host, Host: ftpConfig.host,

1
pkg/storage/s3/s3.go
View File

@@ -93,7 +93,6 @@ func (s s3Storage) Copy(fileName string) error {
// CopyFrom copies a file from the remote server to local storage // CopyFrom copies a file from the remote server to local storage
func (s s3Storage) CopyFrom(fileName string) error { func (s s3Storage) CopyFrom(fileName string) error {
utils.Info("Copy data from S3 storage...")
file, err := os.Create(filepath.Join(s.LocalPath, fileName)) file, err := os.Create(filepath.Join(s.LocalPath, fileName))
if err != nil { if err != nil {
return err return err