Fix arguments in amqp monitor (#942)

starwarfan · web-flow · commit 387db8dfeaf5 · 2021-03-15T17:39:18.000+08:00
diff --git a/source/common/amqpClient.js b/source/common/amqpClient.js
@@ -65,7 +65,7 @@ class RpcClient {
               delete this.callMap[msg.corrID];
             }
           } else {
-            log.warn('Late rpc reply:', message);
+            log.warn('Late rpc reply:', msg);
           }
         } catch (err) {
           log.error('Error processing response: ', err);
@@ -321,10 +321,11 @@ class TopicParticipant {
 }
 
 class Monitor {
-  constructor(amqpCli) {
+  constructor(amqpCli, onMessage) {
     this.bus = amqpCli;
     this.queue = '';
     this.ready = false;
+    this.onMessage = onMessage;
   }
 
   setup() {
@@ -351,10 +352,6 @@ class Monitor {
     });
   }
 
-  setMsgReceiver(onMessage) {
-    this.onMessage = onMessage;
-  };
-
   close() {
     this.ready = false;
     return this.bus.channel.cancel(this.consumerTag)

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class RpcClient {`
`65`	`65`	`delete this.callMap[msg.corrID];`
`66`	`66`	`}`
`67`	`67`	`} else {`
`68`		`- log.warn('Late rpc reply:', message);`
	`68`	`+ log.warn('Late rpc reply:', msg);`
`69`	`69`	`}`
`70`	`70`	`} catch (err) {`
`71`	`71`	`log.error('Error processing response: ', err);`
`@@ -321,10 +321,11 @@ class TopicParticipant {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`class Monitor {`
`324`		`- constructor(amqpCli) {`
	`324`	`+ constructor(amqpCli, onMessage) {`
`325`	`325`	`this.bus = amqpCli;`
`326`	`326`	`this.queue = '';`
`327`	`327`	`this.ready = false;`
	`328`	`+ this.onMessage = onMessage;`
`328`	`329`	`}`
`329`	`330`
`330`	`331`	`setup() {`
`@@ -351,10 +352,6 @@ class Monitor {`
`351`	`352`	`});`
`352`	`353`	`}`
`353`	`354`
`354`		`- setMsgReceiver(onMessage) {`
`355`		`- this.onMessage = onMessage;`
`356`		`- };`
`357`		`-`
`358`	`355`	`close() {`
`359`	`356`	`this.ready = false;`
`360`	`357`	`return this.bus.channel.cancel(this.consumerTag)`