support earlgrey 0.1.0

iconservice/icon_inner_service.py

@@ -448,12 +448,9 @@ def make_error_response(code: Any, message: str) -> dict:
 class IconScoreInnerService(MessageQueueService[IconScoreInnerTask]):
  TaskType = IconScoreInnerTask
 
- def _callback_connection_lost_callback(self, connection: 'RobustConnection'):
- Logger.error("MQ Connection lost. [Service]")
- # self.clean_close()
-
- def _callback_connection_reconnect_callback(self, connection: 'RobustConnection'):
- Logger.error("MQ Connection reconnect. [Service]")
+ def _callback_connection_close(self, exc: Exception):
+ Logger.error(tag=_TAG, msg=f"[Inner Service] connection closed. {exc}")
+ self.clean_close()
 
  def clean_close(self):
  Logger.debug(tag=_TAG, msg="icon service will be closed")
@@ -463,8 +460,5 @@ def clean_close(self):
 class IconScoreInnerStub(MessageQueueStub[IconScoreInnerTask]):
  TaskType = IconScoreInnerTask
 
- def _callback_connection_lost_callback(self, connection: 'RobustConnection'):
- Logger.error("MQ Connection lost. [Stub]")
-
- def _callback_connection_reconnect_callback(self, connection: 'RobustConnection'):
- Logger.error("MQ Connection reconnect. [Service]")
+ def _callback_connection_close(self, exc: Exception):
+ Logger.error(tag=_TAG, msg=f"[Inner Stub] connection closed. {exc}")

iconservice/icon_service.py

@@ -200,7 +200,6 @@ async def _check_rabbitmq(amqp_target: str):
  amqp_user_name = os.getenv("AMQP_USERNAME", "guest")
  amqp_password = os.getenv("AMQP_PASSWORD", "guest")
  connection = await aio_pika.connect(host=amqp_target, login=amqp_user_name, password=amqp_password)
- connection.connect()
  except ConnectionRefusedError:
  Logger.error("rabbitmq-service disable", _TAG)
  exit(0)

requirements.txt

@@ -1,7 +1,7 @@
 setproctitle~=1.1.10
 plyvel~=1.2.0
 coincurve~=13.0.0
-earlgrey~=0.0.4
+earlgrey~=0.1.0
 iconcommons~=1.1.3
 msgpack~=1.0.0
 iso3166~=1.0.1