X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e7af6c00434d5eb34c72ac714cfd450052185762..e5b6b618ea041395c10568d7245d7733b4cb2a1e:/src/websocket/websocket.ts

diff --git a/src/websocket/websocket.ts b/src/websocket/websocket.ts
index d7072d7a29..4fd7cc2c6c 100644
--- a/src/websocket/websocket.ts
+++ b/src/websocket/websocket.ts
@@ -6,20 +6,26 @@ import { RootStore } from '~/store/store';
 import { AuthService } from '~/services/auth-service/auth-service';
 import { Config } from '~/common/config';
 import { WebSocketService } from './websocket-service';
-import { ResourceEventMessage, ResourceEventMessageType } from './resource-event-message';
+import { ResourceEventMessage } from './resource-event-message';
 import { ResourceKind } from '~/models/resource';
 import { loadProcess } from '~/store/processes/processes-actions';
-import { loadContainers } from '../store/processes/processes-actions';
-import { FilterBuilder } from '~/common/api/filter-builder';
+import { loadContainers } from '~/store/processes/processes-actions';
+import { LogEventType } from '~/models/log';
+import { addProcessLogsPanelItem } from '../store/process-logs-panel/process-logs-panel-actions';
+import { FilterBuilder } from "~/services/api/filter-builder";
 
 export const initWebSocket = (config: Config, authService: AuthService, store: RootStore) => {
-    const webSocketService = new WebSocketService(config.websocketUrl, authService);
-    webSocketService.setMessageListener(messageListener(store));
-    webSocketService.connect();
+    if (config.websocketUrl) {
+        const webSocketService = new WebSocketService(config.websocketUrl, authService);
+        webSocketService.setMessageListener(messageListener(store));
+        webSocketService.connect();
+    } else {
+        console.warn("WARNING: webSocketUrl is not configured on the API Server");
+    }
 };
 
 const messageListener = (store: RootStore) => (message: ResourceEventMessage) => {
-    if (message.eventType === ResourceEventMessageType.CREATE || message.eventType === ResourceEventMessageType.UPDATE) {
+    if (message.eventType === LogEventType.CREATE || message.eventType === LogEventType.UPDATE) {
         switch (message.objectKind) {
             case ResourceKind.CONTAINER_REQUEST:
                 return store.dispatch(loadProcess(message.objectUuid));
@@ -30,6 +36,7 @@ const messageListener = (store: RootStore) => (message: ResourceEventMessage) =>
             default:
                 return;
         }
+    } else {
+        return store.dispatch(addProcessLogsPanelItem(message as ResourceEventMessage<{text: string}>));
     }
-    return ;
 };