alanyeung il y a 4 ans
Parent
commit
02aeb228aa

BIN
gomatlab


+ 2 - 0
mod/server/core.go

@@ -7,6 +7,7 @@ import (
 
 //Handler is handler
 type Handler struct {
+	ID        int
 	stdout    io.ReadCloser
 	stdin     io.WriteCloser
 	cmd       *exec.Cmd
@@ -17,6 +18,7 @@ type Handler struct {
 //NewHandler means everythign starts here :)
 func NewHandler() *Handler {
 	NewlyCreatedHandler := Handler{
+		ID:        0,
 		isRunning: false,
 		log:       []Log{},
 	}

+ 2 - 1
mod/server/io.go

@@ -39,10 +39,11 @@ func (server *Handler) SendCommand(command string) bool {
 func (server *Handler) AddLogEntry(line string) {
 	if string(line) != "" {
 		newLog := Log{
-			ID:        len(server.log),
+			ID:        server.ID,
 			Timestamp: time.Now(),
 			Log:       string(line),
 		}
+		server.ID++
 		server.log = append(server.log, newLog)
 	}
 }

+ 2 - 3
mod/server/server.go

@@ -44,19 +44,18 @@ func (server *Handler) startCheckStatus() {
 
 //StartStdout is exported
 func (server *Handler) StartStdout() {
-	i := len(server.log)
 	buf := bufio.NewReader(server.stdout)
 	go func() {
 		for {
 			line, _, _ := buf.ReadLine()
 			if string(line) != "" {
 				newLog := Log{
-					ID:        i,
+					ID:        server.ID,
 					Timestamp: time.Now(),
 					Log:       string(line),
 				}
 				server.log = append(server.log, newLog)
-				i++
+				server.ID++
 			}
 		}
 	}()

BIN
tmp/49eb3d1d-0673-4ec0-9226-8b019b37cd5c.png


BIN
tmp/99470ca1-b525-4667-9f65-f4c75089ea6a.png


BIN
tmp/a6dd2a94-9eb9-4556-81cd-4a83c9495ca4.png


+ 0 - 6
webroot/index.html

@@ -51,12 +51,6 @@
                     $("#log").append(value.Log + "<br>");
                     currentLogID = value.ID + 1;
                 });
-                var data = $("#log").val().split("\n");
-                if (data.length > 3001) {
-                    $("#log").val("---Log timmeed---\n");
-                    data = data.splice(data.length - 2000, data.length - 1);
-                    $("#log").val(data.join("\n"));
-                }
                 loading = false;
             });
         }