forked from coop-cloud/abra
fix: don't delete server dir on cleanup if not empty
Part of coop-cloud/organising#325.
This commit is contained in:
parent
a93786c6be
commit
27e0708ac7
|
@ -80,7 +80,19 @@ func cleanUp(domainName string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.Warnf("cleaning up server directory for %s", domainName)
|
logrus.Warnf("cleaning up server directory for %s", domainName)
|
||||||
if err := os.RemoveAll(filepath.Join(config.SERVERS_DIR, domainName)); err != nil {
|
|
||||||
|
serverDir := filepath.Join(config.SERVERS_DIR, domainName)
|
||||||
|
files, err := config.GetAllFilesInDirectory(serverDir)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatalf("unable to list files in %s: %s", serverDir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(files) > 0 {
|
||||||
|
logrus.Warnf("aborting clean up of %s because it is not empty", serverDir)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.RemoveAll(serverDir); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -203,7 +203,7 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
|
||||||
|
|
||||||
for _, server := range servers {
|
for _, server := range servers {
|
||||||
serverDir := path.Join(SERVERS_DIR, server)
|
serverDir := path.Join(SERVERS_DIR, server)
|
||||||
files, err := getAllFilesInDirectory(serverDir)
|
files, err := GetAllFilesInDirectory(serverDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return appFiles, fmt.Errorf("server %s doesn't exist? Run \"abra server ls\" to check", server)
|
return appFiles, fmt.Errorf("server %s doesn't exist? Run \"abra server ls\" to check", server)
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,8 +66,8 @@ func ReadServerNames() ([]string, error) {
|
||||||
return serverNames, nil
|
return serverNames, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getAllFilesInDirectory returns filenames of all files in directory
|
// GetAllFilesInDirectory returns filenames of all files in directory
|
||||||
func getAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
|
||||||
var realFiles []fs.FileInfo
|
var realFiles []fs.FileInfo
|
||||||
|
|
||||||
files, err := ioutil.ReadDir(directory)
|
files, err := ioutil.ReadDir(directory)
|
||||||
|
|
Loading…
Reference in New Issue