Bläddra i källkod

Log print cleanup, status icons

luis 7 år sedan
förälder
incheckning
0d3e10147b
2 ändrade filer med 7 tillägg och 20 borttagningar
  1. 6 6
      browser/vue-flow/src/components/flow/nodestatus.vue
  2. 1 14
      go/src/flowserver/session.go

+ 6 - 6
browser/vue-flow/src/components/flow/nodestatus.vue

@@ -28,11 +28,11 @@ export default {
   computed: {
     iconProps () {
       return {
-        x: -12,
-        y: -12,
+        x: -14,
+        y: -14,
         viewBox: '-4 -4 72 72',
-        width: 24,
-        height: 24
+        width: 28,
+        height: 28
       }
     }
   }
@@ -56,7 +56,7 @@ export default {
 
 .flow-node__activity-icon  >* {
   transform-origin: 50% 50%;
-  stroke-width: 8px;
+  stroke-width: 6px;
   stroke: inherits;
 }
 
@@ -64,7 +64,7 @@ export default {
   -webkit-animation: spin 1s infinite linear;
   -moz-animation: spin 1s infinite linear;
   animation: spin 1s infinite linear;
-  stroke: #00c !default;
+  stroke: #00c;
 }
 
 .flow-node__activity[status=error] .flow-node__activity-icon  > * {

+ 1 - 14
go/src/flowserver/session.go

@@ -162,12 +162,9 @@ func (s *FlowSession) Document(c *websocket.Conn) error {
 func (s *FlowSession) NodeRun(c *websocket.Conn, data []byte) error {
 	var err error
 	ID := string(data[1 : len(data)-1]) // remove " instead of unmarshalling json
-	log.Println("Node will run", ID)
 	if s.flow != nil {
-		log.Println("Node already running")
 		return errors.New("node already running")
 	}
-	log.Println("Flow--\n", s.flow)
 
 	// Clear activity
 	s.nodeActivity = map[string]*NodeActivity{}
@@ -182,12 +179,8 @@ func (s *FlowSession) NodeRun(c *websocket.Conn, data []byte) error {
 		defer func() { // After routing gone
 			s.flow = nil
 		}()
-		log.Println("Attaching hooks")
-		//XXX: Transform this function to a typed hook structure
-
 		s.flow.Hook(flow.Hook{
 			Any: func(name string, ID string, extra ...flow.Data) {
-				log.Println("Flow lock")
 				s.Lock()
 				defer s.Unlock()
 
@@ -197,7 +190,6 @@ func (s *FlowSession) NodeRun(c *websocket.Conn, data []byte) error {
 					s.nodeActivity[ID] = act
 				}
 				status := ""
-				log.Println("Switching funcs:", name)
 				switch name {
 				case "Wait":
 					status = "waiting"
@@ -214,24 +206,19 @@ func (s *FlowSession) NodeRun(c *websocket.Conn, data []byte) error {
 					return
 				}
 				act.Status = status
-				log.Println("Broadcasting the message")
 				s.broadcast(nil, flowmsg.SendMessage{OP: "nodeActivity", Data: s.nodeActivity})
 
 			},
 		})
 
-		log.Println("Fetching operation:", ID)
 		op := s.flow.Res(ID)
 		if s.flow.Err() != nil {
 			log.Println("error fetching document", s.flow.Err())
 		}
-
-		log.Println("Execute node", op)
-		res := op.Process()
+		op.Process()
 		if s.flow.Err() != nil {
 			log.Println("error processing node", s.flow.Err())
 		}
-		log.Println("Node Result:", res)
 	}()
 
 	return nil