diff --git a/app/authenticated/route.js b/app/authenticated/route.js index f1ba21bc0..9564815ed 100644 --- a/app/authenticated/route.js +++ b/app/authenticated/route.js @@ -169,6 +169,7 @@ export default Ember.Route.extend(Subscribe, { reset() { // Forget all the things + console.log('Store Reset'); this.get('userStore').reset(); this.get('store').reset(); // Service has extra special hackery to cache relationships diff --git a/app/components/k8s/container-section/template.hbs b/app/components/k8s/container-section/template.hbs index 02a462b1f..c4045e01e 100644 --- a/app/components/k8s/container-section/template.hbs +++ b/app/components/k8s/container-section/template.hbs @@ -2,7 +2,7 @@
| {{t 'k8s.containersSection.containersName'}} | +{{t 'k8s.containersSection.containerName'}} | {{t 'generic.image'}} | {{t 'k8s.containersSection.status'}} | {{t 'k8s.containersSection.message'}} | diff --git a/app/mixins/subscribe.js b/app/mixins/subscribe.js index 33612a262..be2feb607 100644 --- a/app/mixins/subscribe.js +++ b/app/mixins/subscribe.js @@ -27,7 +27,7 @@ export default Ember.Mixin.create({ var metadata = socket.getMetadata(); var socketProject = metadata.projectId; if ( currentProject !== socketProject ) { - console.error(`Subscribe ignoring message, current=${currentProject} socket=${socketProject}`, this.forStr()); + console.error(`Subscribe ignoring message, current=${currentProject} socket=${socketProject} ` + this.forStr()); this.connectSubscribe(); return; } @@ -84,7 +84,7 @@ export default Ember.Mixin.create({ var socket = this.get('subscribeSocket'); if ( socket ) { - console.log('Subscribe disconnect', this.forStr()); + console.log('Subscribe disconnect ' + this.forStr()); socket.disconnect(); } }, @@ -127,14 +127,14 @@ export default Ember.Mixin.create({ // WebSocket disconnected (unexpectedly) subscribeDisconnected: function() { - console.log('Subscribe disconnected', this.forStr()); + console.log('Subscribe disconnected ' + this.forStr()); if ( this.get('reconnect') ) { this.connectSubscribe(); } }, subscribePing: function() { - console.log('Subscribe ping', this.forStr()); + console.log('Subscribe ping ' + this.forStr()); }, hostChanged: function(change) { diff --git a/app/utils/socket.js b/app/utils/socket.js index e99b8fcb8..92bb473b0 100644 --- a/app/utils/socket.js +++ b/app/utils/socket.js @@ -14,8 +14,6 @@ const CLOSING = 'closing'; const RECONNECTING = 'reconnecting'; export default Ember.Object.extend(Ember.Evented, { - growl: Ember.inject.service(), - url: null, autoReconnect: true, frameTimeout: 11000, @@ -170,7 +168,7 @@ export default Ember.Object.extend(Ember.Evented, { }, _closed() { - console.log('Socket', this.get('_closingId'), 'closed'); + console.log(`Socket ${this.get('_closingId')} closed`); let wasConnected = false; if ( [CONNECTED, CLOSING].indexOf(this.get('_state')) >= 0 ) @@ -189,12 +187,15 @@ export default Ember.Object.extend(Ember.Evented, { this.set('_disconnectedAt', (new Date()).getTime()); } - if ( isSafari && !safariWarningShown && !wasConnected && this.get('url').indexOf('wss://') === 0 ) + if ( isSafari && !wasConnected && this.get('url').indexOf('wss://') === 0 ) { this.set('autoReconnect', false); this.set('_state', DISCONNECTED); - safariWarningShown = true; - this.get('growl').error('Error connecting to WebSocket','Safari does not support WebSockets connecting to a self-signed or unrecognized certificate. Use http:// instead of https:// or reconfigure the server with a valid certificate from a recognized certificate authority. Streaming stats, logs, shell/console, and auto-updating of the state of resources in the UI will not work until this is resolved.'); + if ( !safariWarningShown ) + { + safariWarningShown = true; + window.l('service:growl').error('Error connecting to WebSocket','Safari does not support WebSockets connecting to a self-signed or unrecognized certificate. Use http:// instead of https:// or reconfigure the server with a valid certificate from a recognized certificate authority. Streaming stats, logs, shell/console, and auto-updating of the state of resources in the UI will not work until this is resolved.'); + } } else if ( this.get('autoReconnect') ) { @@ -218,6 +219,6 @@ export default Ember.Object.extend(Ember.Evented, { args.push(`(state=${this.get('_state')}, id=${this.get('_socket.__sockId')})`); - console.log.apply(console, args); + console.log(args.join(" ")); }, }); diff --git a/package.json b/package.json index 974479790..6ff8049b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "1.0.12", + "version": "1.1.0", "private": true, "directories": { "doc": "doc",
|---|