'Refactored by Sourcery'

tozhovez · Oct 11, 2020 · c96a782 · c96a782
1 parent b6d40be
commit c96a782
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 29 deletions.
diff --git a/sites-checker/Infra/scripts/consul_client.py b/sites-checker/Infra/scripts/consul_client.py
@@ -43,14 +43,11 @@ def get(self, key, prefix=None):
            stop=stop_after_delay(RETRY_DELAY_IN_SECONDS))
     def get_all(self):
         try:
-            only_kv_data = []
             _, data = self.consul_client.kv.get(key='', recurse=True)
-            for item in data:
-                only_kv_data.append({
+            return [{
                     "Key": item['Key'],
                     "Value": json.loads((item['Value'].decode('utf-8')))
-                })
-            return only_kv_data
+                } for item in data]
         except ConnectionError as ex:
             self.connect()
             raise ex

diff --git a/sites-checker/SitesCheckerService/api/health_check.py b/sites-checker/SitesCheckerService/api/health_check.py
@@ -19,9 +19,7 @@ async def check_health(self, request):
 
         # write response
 
-        res_status = 200
-
-        return res_status
+        return 200
 
 
 

diff --git a/sites-checker/SitesCheckerService/core/consul_client.py b/sites-checker/SitesCheckerService/core/consul_client.py
@@ -43,14 +43,11 @@ def get(self, key, prefix=None):
            stop=stop_after_delay(RETRY_DELAY_IN_SECONDS))
     def get_all(self):
         try:
-            only_kv_data = []
             _, data = self.consul_client.kv.get(key='', recurse=True)
-            for item in data:
-                only_kv_data.append({
+            return [{
                     "Key": item['Key'],
                     "Value": json.loads((item['Value'].decode('utf-8')))
-                })
-            return only_kv_data
+                } for item in data]
         except ConnectionError as ex:
             self.connect()
             raise ex

diff --git a/sites-checker/SitesCheckerService/core/core_module.py b/sites-checker/SitesCheckerService/core/core_module.py
@@ -17,29 +17,28 @@ class CoreModule(Module):
     @provider
     def provide_consul_client(self) -> ConsulClient:
         """innit consul client"""
-        consul_client = ConsulClient(host=os.getenv('CONSUL_HOST', '127.0.0.1'), prefix='sites-checker-service')
-        return consul_client
+        return ConsulClient(
+            host=os.getenv('CONSUL_HOST', '127.0.0.1'),
+            prefix='sites-checker-service',
+        )
 
     @singleton
     @provider
     def provide_postgres_client(self,
                                 conf_service: ConfigService
                                 ) -> PostgresClient:
         """innit Postgres client"""
-        postgres_client = PostgresClient(dsn=conf_service.postgres_url)
         # TODO: check asyncio support
         # await postgres_client.connect()
-        return postgres_client
+        return PostgresClient(dsn=conf_service.postgres_url)
 
     @singleton
     @provider
     def provide_logger(self) -> Logger:
         """innit logger"""
-        logger = get_logger(
+        return get_logger(
             logger_name='SitesCheckerService',
             logger_format=LoggingFormat.JSON,
             logger_level=logging.INFO,
             logger_output=LoggingOutput.STDOUT,
         )
-
-        return logger
diff --git a/sites-checker/SitesCheckerService/core/postgres_client.py b/sites-checker/SitesCheckerService/core/postgres_client.py
@@ -30,8 +30,7 @@ def prepare(self, query, data):
     def select(self, query):
         cursor = self.conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
         cursor.execute(query)
-        for result in cursor.fetchall():
-            yield result
+        yield from cursor.fetchall()
         cursor.close()
 
 
@@ -73,8 +72,7 @@ def insert(self, sql):
         cursor = self.conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
         try:
             cursor.execute(sql)
-            for result in cursor.fetchall():
-                yield result
+            yield from cursor.fetchall()
         except psycopg2.DatabaseError as ex:
             raise ex
         else:

diff --git a/sites-checker/SitesCheckerService/jobs/job_manager.py b/sites-checker/SitesCheckerService/jobs/job_manager.py
@@ -13,8 +13,7 @@ def add_interval_job(self, callback, interval: float):
         self.scheduler.add_job(callback, 'interval', seconds=interval)
 
     def run_once(self, callback, args: list):
-        job = self.scheduler.add_job(callback, 'date', args=args)
-        return job
+        return self.scheduler.add_job(callback, 'date', args=args)
 
     def start(self):
         self.scheduler = AsyncIOScheduler()

diff --git a/sites-checker/SitesCheckerService/sites_checker_service.py b/sites-checker/SitesCheckerService/sites_checker_service.py
@@ -37,12 +37,10 @@ def __init__(self,
     async def status(self):
         status_code = 0
 
-        service_state = {
+        return {
             'status_code': status_code,
         }
 
-        return service_state
-
 
     async def kill(self):
         """