summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunil Shetye2025-03-19 07:57:27 +0530
committerSunil Shetye2025-03-19 07:57:27 +0530
commitcf034feabef814501e18fa9bb7bc1dcc4e520cec (patch)
treef227d3475657efc68c55a79314a1ff1398d87417
parent4e85f92d3c3fe61b9ace1f80acb7942f0dff471f (diff)
downloadCommon-Interface-Project-cf034feabef814501e18fa9bb7bc1dcc4e520cec.tar.gz
Common-Interface-Project-cf034feabef814501e18fa9bb7bc1dcc4e520cec.tar.bz2
Common-Interface-Project-cf034feabef814501e18fa9bb7bc1dcc4e520cec.zip
add date change filter for console
-rw-r--r--blocks/blocks/celery_tasks.py20
-rw-r--r--blocks/saveAPI/views.py4
-rw-r--r--blocks/simulationAPI/helpers/scilab_manager.py6
3 files changed, 21 insertions, 9 deletions
diff --git a/blocks/blocks/celery_tasks.py b/blocks/blocks/celery_tasks.py
index bd18d6ab..b24e1ae8 100644
--- a/blocks/blocks/celery_tasks.py
+++ b/blocks/blocks/celery_tasks.py
@@ -12,10 +12,23 @@ if "celery" in sys.argv[0]:
import os
from celery import Celery
from celery.signals import worker_ready, worker_shutdown
+from datetime import datetime
from django.conf import settings
import logging
import logging.config
+
+class DateChangeFilter(logging.Filter):
+ last_date = None
+
+ def filter(self, record):
+ current_date = datetime.now().date()
+ if DateChangeFilter.last_date != current_date:
+ DateChangeFilter.last_date = current_date
+ logging.getLogger().info(f"--- {current_date} ---")
+ return True
+
+
# Define log format
LOG_FILE = "logs/celery.log"
@@ -37,6 +50,11 @@ CELERY_LOGGING_CONFIG = {
"datefmt": LOG_DATE_FORMAT,
},
},
+ "filters": {
+ "date_change_filter": {
+ "()": DateChangeFilter,
+ },
+ },
"handlers": {
"task_console": {
"class": "logging.StreamHandler",
@@ -45,8 +63,8 @@ CELERY_LOGGING_CONFIG = {
"worker_console": {
"class": "logging.StreamHandler",
"formatter": "worker_formatter",
+ "filters": ["date_change_filter"],
},
-
"task_file": {
"class": "logging.handlers.TimedRotatingFileHandler",
"filename": LOG_FILE,
diff --git a/blocks/saveAPI/views.py b/blocks/saveAPI/views.py
index 9d6d3a8a..5b315b33 100644
--- a/blocks/saveAPI/views.py
+++ b/blocks/saveAPI/views.py
@@ -58,9 +58,7 @@ class StateSaveView(APIView):
queryset = StateSave.objects.get(
save_id=request.data.get("save_id", None),
data_dump=request.data["data_dump"],
- script_dump=request.data["script_dump"]
- ),
-
+ script_dump=request.data["script_dump"])
serializer = StateSaveSerializer(data=request.data)
if serializer.is_valid():
queryset.name = serializer.data["name"]
diff --git a/blocks/simulationAPI/helpers/scilab_manager.py b/blocks/simulationAPI/helpers/scilab_manager.py
index a13ff507..3bb3c37d 100644
--- a/blocks/simulationAPI/helpers/scilab_manager.py
+++ b/blocks/simulationAPI/helpers/scilab_manager.py
@@ -9,7 +9,7 @@ import glob
import json
import logging
import os
-from os.path import abspath, dirname, exists, isfile, join
+from os.path import abspath, exists, isfile, join
import re
import signal
import subprocess
@@ -107,10 +107,6 @@ def remove(filename):
return False
-# change directory before using relative paths
-ROOTDIR = dirname(abspath(__file__))
-os.chdir(ROOTDIR)
-
worker_logger = logging.getLogger("celery")
logger = get_task_logger(__name__)