MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pterodactyl/wings into develop

Browse Source
This commit is contained in:
Dane Everitt 2020-08-24 19:45:25 -07:00
commit f82c91afbe
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/root.go
View File

@ -337,6 +337,10 @@ func Execute() error {
// Configures the global logger for Zap so that we can call it from any location // Configures the global logger for Zap so that we can call it from any location
// in the code without having to pass around a logger instance. // in the code without having to pass around a logger instance.
func configureLogging(logDir string, debug bool) error { func configureLogging(logDir string, debug bool) error {
if err := os.MkdirAll(path.Join(logDir, "/install"), 0700); err != nil {
return errors.WithStack(err)
}
cfg := zap.NewProductionConfig() cfg := zap.NewProductionConfig()
if debug { if debug {
cfg = zap.NewDevelopmentConfig() cfg = zap.NewDevelopmentConfig()

5
config/config_system.go
View File

@ -49,11 +49,6 @@ func (sc *SystemConfiguration) ConfigureDirectories() error {
return err return err
} }
log.WithField("path", sc.LogDirectory).Debug("ensuring log directory exists")
if err := os.MkdirAll(path.Join(sc.LogDirectory, "/install"), 0700); err != nil {
return err
}
log.WithField("path", sc.Data).Debug("ensuring server data directory exists") log.WithField("path", sc.Data).Debug("ensuring server data directory exists")
if err := os.MkdirAll(sc.Data, 0700); err != nil { if err := os.MkdirAll(sc.Data, 0700); err != nil {
return err return err

3
server/filesystem.go
View File

@ -574,7 +574,8 @@ func (fs *Filesystem) Copy(p string) error {
} }
defer dest.Close() defer dest.Close()
if _, err := io.Copy(dest, source); err != nil { buf := make([]byte, 1024*4)
if _, err := io.CopyBuffer(dest, source, buf); err != nil {
return errors.WithStack(err) return errors.WithStack(err)
} }