Merge pull request #434 from yungwine/bot-ux

Bot ux

Author: igroman787

modules/alert_bot.py

@@ -31,7 +31,7 @@ def init_alerts():
         "low_wallet_balance": Alert(
             "low",
             "Validator's wallet balance is less than 10 TON",
-            "Validator's wallet {wallet} balance is less than 10 TON: {balance} TON.",
+            "Validator's wallet <code>{wallet}</code> balance is less than 10 TON: {balance} TON.",
             18 * HOUR
         ),
         "db_usage_80": Alert(
@@ -165,8 +165,12 @@ def send_alert(self, alert_name: str, *args, **kwargs):
 
 Hostname: <code>{self.hostname}</code>
 Node IP: <code>{self.ip}</code>
-ADNL: <code>{self.adnl}</code>
-Wallet: <code>{self.wallet}</code>
+ADNL: <code>{self.adnl}</code>'''
+
+        if self.ton.using_validator():
+            text += f"\nWallet: <code>{self.wallet}</code>"
+
+        text += f'''
 Time: <code>{time_}</code> (<code>{int(time.time())}</code>)
 Alert name: <code>{alert_name}</code>
 Severity: <code>{alert.severity}</code>
@@ -358,6 +362,7 @@ def check_adnl_connection_failed(self):
         utils_module = UtilitiesModule(self.ton, self.local)
         ok, error = utils_module.check_adnl_connection()
         if not ok:
+            self.local.add_log(error, "warning")
             self.send_alert("adnl_connection_failed")
 
     def get_myself_from_election(self, config: dict):

modules/utilities.py

@@ -355,15 +355,15 @@ def check_adnl_connection(self):
                 response = requests.post(url, json=data, timeout=5).json()
             except Exception as e:
                 ok = False
-                error = f'{{red}}Failed to check ADNL connection to local node: {type(e)}: {e}{{endc}}'
+                error = f'Failed to check ADNL connection to local node: {type(e)}: {e}'
                 continue
             result = response.get("ok")
             if result:
                 ok = True
                 break
             if not result:
                 ok = False
-                error = f'{{red}}Failed to check ADNL connection to local node: {response.get("message")}{{endc}}'
+                error = f'Failed to check ADNL connection to local node: {response.get("message")}'
         return ok, error
 
     def get_pool_data(self, args):

mytonctrl/mytonctrl.py

@@ -488,6 +488,7 @@ def check_adnl(local, ton):
 	utils_module = UtilitiesModule(ton, local)
 	ok, error = utils_module.check_adnl_connection()
 	if not ok:
+		error = "{red}" + error + "{endc}"
 		print_warning(local, error)
 #end define