From 325927739ec392a58d333e1163ce0c9ce10b3c01 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Mon, 29 Jan 2024 13:02:14 +0300
Subject: [PATCH] info-fix

---
 .gitignore         | 2 +-
 resolvers/topic.py | 2 +-
 services/auth.py   | 4 +++-
 services/search.py | 8 +++-----
 services/viewed.py | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79420ef2..110821a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,4 +149,4 @@ dev-server.pid
 backups/
 poetry.lock
 .ruff_cache
-dev-server.pid
+.jj
diff --git a/resolvers/topic.py b/resolvers/topic.py
index 73ebd049..071e4658 100644
--- a/resolvers/topic.py
+++ b/resolvers/topic.py
@@ -159,7 +159,7 @@ def topic_follow(follower_id, slug):
             topic = session.query(Topic).where(Topic.slug == slug).one()
             _following = TopicFollower(topic=topic.id, follower=follower_id)
             return True
-    except Exception:
+    except Exception as _exc:
         return False
 
 
diff --git a/services/auth.py b/services/auth.py
index 88d278db..22effd86 100644
--- a/services/auth.py
+++ b/services/auth.py
@@ -48,7 +48,9 @@ async def check_auth(req) -> str | None:
         }
 
         gql = {
-            'query': f'query {operation}($params: ValidateJWTTokenInput!) {{ {query_name}(params: $params) {{ is_valid claims }} }}',
+            'query': f'query {operation}($params: ValidateJWTTokenInput!)  {{' +
+                     f'{query_name}(params: $params) {{ is_valid claims }} ' +
+                     '}',
             'variables': variables,
             'operationName': operation,
         }
diff --git a/services/search.py b/services/search.py
index a8bc1c04..7efcaa1b 100644
--- a/services/search.py
+++ b/services/search.py
@@ -14,7 +14,7 @@ logger = logging.getLogger('\t[services.search]\t')
 logger.setLevel(logging.DEBUG)
 
 ELASTIC_HOST = (
-    os.environ.get('ELASTIC_HOST', '').replace('https://', '').replace('http://', '')
+    os.environ.get('ELASTIC_HOST', '').replace('https://', '')
 )
 ELASTIC_USER = os.environ.get('ELASTIC_USER', '')
 ELASTIC_PASSWORD = os.environ.get('ELASTIC_PASSWORD', '')
@@ -99,8 +99,8 @@ class SearchService:
                 self.client = None
 
     def info(self):
-        if self.client:
-            logger.info(f' Поиск подключен: {self.client.host}')
+        if isinstance(self.client, OpenSearch):
+            logger.info(f' Поиск подключен: {self.client.info()}')
         else:
             logger.info(' * Задайте переменные среды для подключения к серверу поиска')
 
@@ -119,8 +119,6 @@ class SearchService:
                     )
                     self.client.indices.close(index=self.index_name)
                     self.client.indices.open(index=self.index_name)
-                except Exception as _exc:  # noqa: S110
-                    pass
                 finally:
                     self.lock.release()
             else:
diff --git a/services/viewed.py b/services/viewed.py
index cabd596d..fb824a9d 100644
--- a/services/viewed.py
+++ b/services/viewed.py
@@ -197,7 +197,7 @@ class ViewedStorage:
             try:
                 await self.update_pages()
                 failed = 0
-            except Exception:
+            except Exception as _exc:
                 failed += 1
                 logger.info(' - Обновление не удалось #%d, ожидание 10 секунд' % failed)
                 if failed > 3: