Merge 467f41e into b256ea9

Author: NevmerzhitskyYura

docker-compose.yml

@@ -52,6 +52,7 @@ services:
         condition: service_healthy
       scheduler:
         condition: service_started
+
     env_file:
       - docker.env
     ports:
@@ -93,3 +94,16 @@ services:
     environment:
       LOGGING_CONF: /worker/utils/logging.conf
     restart: on-failure
+
+  nginx:
+    build:
+      context: .
+      dockerfile: nginx.Dockerfile
+    container_name: nginx_server
+    ports:
+      - 8080:80
+
+    restart: on-failure
+
+
+

nginx.Dockerfile

@@ -0,0 +1,6 @@
+FROM nginx:latest
+
+COPY ./stock_dashboard_client/build /var/www
+COPY nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80
+ENTRYPOINT ["nginx","-g","daemon off;"]

nginx.conf

@@ -0,0 +1,48 @@
+# auto detects a good number of processes to run
+worker_processes auto;
+
+#Provides the configuration file context in which the directives that affect connection processing are specified.
+events {
+    # Sets the maximum number of simultaneous connections that can be opened by a worker process.
+    worker_connections 8;
+    # Tells the worker to accept multiple connections at a time
+    multi_accept on;
+}
+
+
+http {
+    server {
+        # listen on port 80
+        listen 80;
+        # where the root here
+        root /var/www;
+        # what file to server as index
+        index index.html index.htm;
+
+        location / {
+            # First attempt to serve request as file, then
+            # as directory, then fall back to redirecting to index.html
+            try_files $uri $uri/ /index.html;
+        }
+
+        # Media: images, icons, video, audio, HTC
+        location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
+          expires 1M;
+          access_log off;
+          add_header Cache-Control "public";
+        }
+
+        # Javascript and CSS files
+        location ~* \.(?:css|js)$ {
+            try_files $uri =404;
+            expires 1y;
+            access_log off;
+            add_header Cache-Control "public";
+        }
+
+        # Any route containing a file extension (e.g. /devicesfile.js)
+        location ~ ^.+\..+$ {
+            try_files $uri =404;
+        }
+    }
+}

stock_dashboard_api/logging.conf

@@ -23,6 +23,12 @@ handlers=consoleHandler
 qualname=workers
 propagate=0
 
+[logger_scheduler]
+level=INFO
+handlers=consoleHandler
+qualname=scheduler
+propagate=0
+
 [logger_views]
 level=INFO
 handlers=consoleHandler

stock_dashboard_api/models/stock_model.py

@@ -296,7 +296,7 @@ def _fill_gaps_in_data(self, datetime_from, datetime_to, stock_data):
                             self.name,
                             gap[datetime_from_index].isoformat(),
                             gap[datetime_to_index].isoformat())
-            publish_task(rmq_task.historical_data_task())
+            scheduler_publish_task(rmq_task.historical_data_task())
 
     @classmethod
     def _get_gaps_in_data(cls, datetime_from: datetime, datetime_to: datetime, stock_data: list):

stock_dashboard_api/utils/pool.py

@@ -32,7 +32,6 @@ def __init__(self):
         self.cursor = None
 
     def __enter__(self):
-        logger.info('Get connection from pool %s', id(self.conn))
         for _ in range(TRAILS):
             try:
                 self.conn = Connection.connection_pool.getconn()
@@ -51,11 +50,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             self.conn.rollback()
             self.cursor.close()
             Connection.connection_pool.putconn(self.conn)
-        logger.info('All changes was commited')
         self.conn.commit()
         self.cursor.close()
         Connection.connection_pool.putconn(self.conn)
-        logger.info('Put connection to pool %s', id(self.conn))
 
 
 def pool_manager():

workers/scheduler.py

@@ -10,7 +10,7 @@
 from utils.check_new_stocks import check_new_stocks
 from utils.constants import FETCH_DATA_FOR_PERIOD_TASK, FETCH_NEW_STOCK_TASK, FETCH_HISTORICAL_DATA_TASK
 from utils.db_service import get_all_stocks_in_use, get_stocks_data_last_record, stock_get_id
-from utils.logger import workers_logger as logger
+from utils.logger import scheduler_logger as logger
 from utils.worker_queue import worker_publish_task
 from utils.worker_task import Task
 
@@ -32,7 +32,7 @@ def connect_rmq():
     channel.queue_declare(queue='scheduler_queue', durable=True)
     channel.queue_declare(queue='worker_queue', durable=True)
     channel.basic_consume(queue='scheduler_queue', on_message_callback=scheduler_function)
-    logger.info('Sheduler connect was created')
+    logger.info('Sheduler connection was created')
     channel.start_consuming()
 
 
@@ -73,6 +73,14 @@ def fetch_historical_data(data: dict):
         data['to'] = (start + datetime.timedelta(days=remainder)).isoformat()
         logger.info(f'Send task {data} to workers')
         worker_publish_task(json.dumps(data))
+    data['from'] = start.isoformat()
+    data['to'] = finish.isoformat()
+    logger.info(f'Send task {data} to workers')
+    worker_publish_task(json.dumps(data))
+
+
+
+
 
 
 def scheduler_function(ch, method, properties, body):  # pylint: disable=C0103,  W0613

workers/utils/logger.py

@@ -3,7 +3,7 @@
 from logging.config import fileConfig
 
 LOGGING_CONF = os.getenv('LOGGING_CONF')
-print(LOGGING_CONF)
 fileConfig(LOGGING_CONF, disable_existing_loggers=True)
 pool_logger = logging.getLogger('pool')
 workers_logger = logging.getLogger('workers')
+scheduler_logger = logging.getLogger('scheduler')

workers/worker.py

@@ -1,18 +1,24 @@
+import datetime
 import json
 import os
-import time
 
 import pika
 
-from utils.db_service import insert_stock_data
+from utils.db_service import insert_stock_data, stock_get_id
+from utils.logger import workers_logger as logger
 from utils.yahoo_finance import data_for_stocks_data_update
 
 
 def worker_function(ch, method, properties, body):  # pylint: disable=C0103,  W0613
     body = json.loads(body)
-    data = data_for_stocks_data_update(body["stock_name"], body["from"], body["to"])
+    logger.info(f'Worker Task {body} was received')
+    stock_id = stock_get_id(body['stock_name'])
+    start = datetime.datetime.fromisoformat(body['from'])
+    finish = datetime.datetime.fromisoformat(body['to'])
+    data = data_for_stocks_data_update(body["stock_name"], start, finish)
     for stock in data:
-        insert_stock_data(stock["stock_id"], stock["price"], stock["created_at"])
+        insert_stock_data(stock_id, stock["price"], stock["created_at"])
+    logger.info(f'Worker Task {body} was succeseful done')
     ch.basic_ack(delivery_tag=method.delivery_tag)
 
 
@@ -23,4 +29,5 @@ def worker_function(ch, method, properties, body):  # pylint: disable=C0103,  W0
     channel = connection.channel()
     channel.queue_declare(queue='worker_queue', durable=True)
     channel.basic_consume(queue='worker_queue', on_message_callback=worker_function)
+    logger.info('Worker connection was created')
     channel.start_consuming()