sunguroku 5 лет назад
Родитель
Сommit
0b3a7c4fcf

+ 0 - 1
dashboard/src/main/home/new-project/NewProject.tsx

@@ -235,7 +235,6 @@ export default class NewProject extends Component<PropsType, StateType> {
                     })
                   }
                 });
-
               } else {
                 this.props.setCurrentView('dashboard', null);
               }

+ 3 - 2
dashboard/src/main/home/new-project/Provisioner.tsx

@@ -32,8 +32,8 @@ export default class Provisioner extends Component<PropsType, StateType> {
   componentDidMount() {
     let { currentProject } = this.context;
     let protocol = process.env.NODE_ENV == 'production' ? 'wss' : 'ws'
-    let ws = new WebSocket(`${protocol}://${process.env.API_SERVER}/api/projects/${currentProject.id}/provisioning/${this.props.viewData.kind}/${this.props.viewData.infra_id}/logs`)
-    
+    let ws = new WebSocket(`${protocol}://${process.env.API_SERVER}/api/projects/${currentProject.id}/provision/${this.props.viewData.kind}/${this.props.viewData.infra_id}/logs`)
+
     this.setState({ ws }, () => {
       if (!this.state.ws) return;
   
@@ -42,6 +42,7 @@ export default class Provisioner extends Component<PropsType, StateType> {
       }
   
       this.state.ws.onmessage = (evt: MessageEvent) => {
+        console.log(evt.data)
         this.setState({ logs: [...this.state.logs, evt.data] }, () => {
           this.scrollToBottom()
         })

+ 1 - 1
internal/kubernetes/provisioner/resource_stream.go

@@ -45,7 +45,7 @@ func ResourceStream(client *redis.Client, streamName string, conn *websocket.Con
 			messages := xstream[0].Messages
 			lastID = messages[len(messages)-1].ID
 
-			if writeErr := conn.WriteMessage(websocket.TextMessage, []byte(fmt.Sprint(xstream))); writeErr != nil {
+			if writeErr := conn.WriteMessage(websocket.TextMessage, []byte(fmt.Sprint(messages[0].Values["data"]))); writeErr != nil {
 				errorchan <- writeErr
 				return
 			}