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

Cleanup server stuff since that was getting unweildy

Browse Source
This commit is contained in:
Dane Everitt
2019-04-20 16:26:55 -07:00
parent 870adffc14
commit 49ca2e2404
6 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
http.go
View File

@@ -162,19 +162,19 @@ func (rt *Router) routeServerPower(w http.ResponseWriter, r *http.Request, ps ht
go func(a string, s *server.Server) {
switch a {
case "start":
if err := s.Environment().Start(); err != nil {
if err := s.Environment.Start(); err != nil {
zap.S().Error(err, zap.String("server", s.Uuid), zap.String("action", "start"))
}
break
case "stop":
if err := s.Environment().Stop(); err != nil {
if err := s.Environment.Stop(); err != nil {
zap.S().Error(err, zap.String("server", s.Uuid), zap.String("action", "stop"))
}
break
case "restart":
break
case "kill":
if err := s.Environment().Terminate(os.Kill); err != nil {
if err := s.Environment.Terminate(os.Kill); err != nil {
zap.S().Error(err, zap.String("server", s.Uuid), zap.String("action", "kill"))
}
}
@@ -206,7 +206,7 @@ func (rt *Router) routeServerLogs(w http.ResponseWriter, r *http.Request, ps htt
func (rt *Router) routeServerFileRead(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
s := rt.Servers.Get(ps.ByName("server"))
cleaned, err := s.Filesystem().SafePath(ps.ByName("path"))
cleaned, err := s.Filesystem.SafePath(ps.ByName("path"))
if err != nil {
http.Error(w, "could not determine path", http.StatusInternalServerError)
return
@@ -248,7 +248,7 @@ func (rt *Router) routeServerFileRead(w http.ResponseWriter, r *http.Request, ps
func (rt *Router) routeServerFileList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
s := rt.Servers.Get(ps.ByName("server"))
stats, err := s.Filesystem().ListDirectory(ps.ByName("path"))
stats, err := s.Filesystem.ListDirectory(ps.ByName("path"))
if os.IsNotExist(err) {
http.NotFound(w, r)
return