diff --git a/output/outputs.go b/output/outputs.go
index 0377625..f4d1726 100644
--- a/output/outputs.go
+++ b/output/outputs.go
@@ -183,7 +183,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
// remove the exited process from user process set
processes.remove(wSession, cmd.Process)
- logger.Tracef("Session [%s] 's running [id=%d, file=%s] has done [stdout err]", sid, runningId, filePath)
+ logger.Tracef("Session [%s] 's running [id=%d, file=%s] has done [stdout %v], ", sid, runningId, filePath, err)
if nil != wsChannel {
channelRet["cmd"] = "run-done"
@@ -227,24 +227,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
buf = strings.Replace(buf, "<", "<", -1)
buf = strings.Replace(buf, ">", ">", -1)
- if nil != err {
- // remove the exited process from user process set
- processes.remove(wSession, cmd.Process)
-
- logger.Tracef("Session [%s] 's running [id=%d, file=%s] has done [stderr err]", sid, runningId, filePath)
-
- channelRet["cmd"] = "run-done"
- channelRet["output"] = "" + buf + ""
- err := wsChannel.WriteJSON(&channelRet)
- if nil != err {
- logger.Error(err)
- break
- }
-
- wsChannel.Refresh()
-
- break
- } else {
+ if nil == err {
channelRet["cmd"] = "run"
channelRet["output"] = "" + buf + ""
err := wsChannel.WriteJSON(&channelRet)
diff --git a/session/users.go b/session/users.go
index 2d15abc..036239c 100644
--- a/session/users.go
+++ b/session/users.go
@@ -277,7 +277,7 @@ func FixedTimeSave() {
for _, u := range users {
if u.Save() {
- logger.Tracef("Saved online user [%s]'s configurations")
+ logger.Tracef("Saved online user [%s]'s configurations", u.Name)
}
}
}