Merge pull request #21 from JimiC/refactoring

Refactor code base.
sjmf · Mar 16, 2017 · dc9b1ae · dc9b1ae
2 parents 3a55ee3 + 284fa0f
commit dc9b1ae
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/app/services/stomp/stomp.service.ts b/src/app/services/stomp/stomp.service.ts
@@ -110,7 +110,7 @@ export class STOMPService {
       this.on_error
     );
 
-    console.log('Connecting...');
+    this.debug('Connecting...');
     this.state.next(STOMPState.TRYING);
 
     return new Promise(
@@ -173,7 +173,7 @@ export class STOMPService {
   public debug(...args: any[]): void {
 
     // Push arguments to this function into console.log
-    if (window.console && console.log && console.log.apply) {
+    if (console && console.log && console.log.apply) {
       console.log.apply(console, args);
     }
   }
@@ -182,7 +182,7 @@ export class STOMPService {
   // Callback run on successfully connecting to server
   public on_connect = () => {
 
-    console.log('Connected');
+    this.debug('Connected');
 
     // Indicate our connected state to observers
     this.state.next(STOMPState.CONNECTED);
@@ -217,7 +217,7 @@ export class STOMPService {
       this.state.next(STOMPState.CLOSED);
 
       // Attempt reconnection
-      console.log('Reconnecting in 5 seconds...');
+      this.debug('Reconnecting in 5 seconds...');
       this.timer = setTimeout(() => {
         this.configure();
         this.try_connect();