feat: Ember connection set up differently

olzzon · Feb 16, 2020 · bc6c6bd · bc6c6bd
1 parent e50b9b7
commit bc6c6bd
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/server/utils/mixerConnections/EmberMixerConnection.ts b/server/utils/mixerConnections/EmberMixerConnection.ts
@@ -41,31 +41,28 @@ export class EmberMixerConnection {
 			} else {
 				logger.error('Ember connection unknown error' + error.message)
 			}
+        })
+        this.emberConnection.on('disconnected', () => {
+            logger.error('Lost Ember connection')
 		})
-		this.emberConnection.on('connected', () => {
-            logger.info('Ember connected')
-            let deviceRoot: any;
-            this.emberConnection.connect()
+        logger.info('Connecting to Ember')
+        let deviceRoot: any;
+        this.emberConnection.connect()
+        .then(() => {
+            console.log("Getting Directory")
+            return this.emberConnection.getDirectory();
+        })
+        .then((r: any) => {
+            console.log("Directory :", r);
+            this.deviceRoot = r;
+            this.emberConnection.expand(r.elements[0])
             .then(() => {
-                console.log("Getting Directory")
-                return this.emberConnection.getDirectory();
+                this.setupMixerConnection();
             })
-            .then((r: any) => {
-                console.log("Directory :", r);
-                this.deviceRoot = r;
-                this.emberConnection.expand(r.elements[0])
-                .then(() => {
-                    this.setupMixerConnection();
-                })
-            })
-            .catch((e: any) => {
-                console.log(e.stack);
-            });
-		})
-		this.emberConnection.on('disconnected', () => {
-            logger.error('Lost Ember connection')
-		})
-
+        })
+        .catch((e: any) => {
+            console.log(e.stack);
+        });
     }
 
     setupMixerConnection() {