Merge pull request #83 from Evanfeenstra/ui

fix ws/wss for https://

plugins/ui/files.go

@@ -494,8 +494,12 @@ Vue.component('empty-icon', {
       this.show()
       this.loggedIn = true
       this.selectedTab = 'Logs'
+      let wsProtocol = 'wss:'
+      if (location.protocol != 'https:') {
+        wsProtocol = 'ws:'
+      }
       this.ws = new WebSocket(
-        api.addToken('ws://'+window.location.host+'/ws')
+        api.addToken(wsProtocol+'//'+window.location.host+'/ws')
       )
       this.ws.onopen = (e) => { this.connected=true }
       this.ws.onclose = (e) => { this.connected=false }

plugins/ui/src/js/main.js

@@ -34,8 +34,12 @@ new Vue({
       this.show()
       this.loggedIn = true
       this.selectedTab = 'Logs'
+      let wsProtocol = 'wss:'
+      if (location.protocol != 'https:') {
+        wsProtocol = 'ws:'
+      }
       this.ws = new WebSocket(
-        api.addToken('ws://'+window.location.host+'/ws')
+        api.addToken(wsProtocol+'//'+window.location.host+'/ws')
       )
       this.ws.onopen = (e) => { this.connected=true }
       this.ws.onclose = (e) => { this.connected=false }

plugins/ui/ui.go

@@ -46,14 +46,8 @@ func configure(plugin *node.Plugin) {
 		}()
 	}))
 
-	node.DEFAULT_LOGGER.SetEnabled(false)
-
 	uiLogger.SetEnabled(true)
 	plugin.Node.AddLogger(uiLogger)
-
-	daemon.Events.Shutdown.Attach(events.NewClosure(func() {
-		node.DEFAULT_LOGGER.SetEnabled(true)
-	}))
 }
 
 func staticFileServer(c echo.Context) error {