github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-04 18:46:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2414 from jumpserver/dev

Browse Source 
[Update] gunicorn的日志
This commit is contained in:
老广 2019-02-19 20:06:37 +08:00 committed by GitHub
commit b7b6218306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/utils.py
View File

@ -69,13 +69,13 @@ class Signer(metaclass=Singleton):
self.secret_key = secret_key self.secret_key = secret_key
def sign(self, value): def sign(self, value):
s = JSONWebSignatureSerializer(self.secret_key) s = JSONWebSignatureSerializer(self.secret_key, algorithm_name='HS256')
return s.dumps(value).decode() return s.dumps(value).decode()
def unsign(self, value): def unsign(self, value):
if value is None: if value is None:
return value return value
s = JSONWebSignatureSerializer(self.secret_key) s = JSONWebSignatureSerializer(self.secret_key, algorithm_name='HS256')
try: try:
return s.loads(value) return s.loads(value)
except BadSignature: except BadSignature:

20
apps/jumpserver/settings.py
View File

@ -26,6 +26,7 @@ CONFIG = load_user_config()
LOG_DIR = os.path.join(PROJECT_DIR, 'logs') LOG_DIR = os.path.join(PROJECT_DIR, 'logs')
JUMPSERVER_LOG_FILE = os.path.join(LOG_DIR, 'jumpserver.log') JUMPSERVER_LOG_FILE = os.path.join(LOG_DIR, 'jumpserver.log')
ANSIBLE_LOG_FILE = os.path.join(LOG_DIR, 'ansible.log') ANSIBLE_LOG_FILE = os.path.join(LOG_DIR, 'ansible.log')
GUNICORN_LOG_FILE = os.path.join(LOG_DIR, 'gunicorn.log')
if not os.path.isdir(LOG_DIR): if not os.path.isdir(LOG_DIR):
os.makedirs(LOG_DIR) os.makedirs(LOG_DIR)
@ -213,10 +214,21 @@ LOGGING = {
'ansible_logs': { 'ansible_logs': {
'encoding': 'utf8', 'encoding': 'utf8',
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.FileHandler', 'class': 'logging.handlers.RotatingFileHandler',
'formatter': 'main', 'formatter': 'main',
'maxBytes': 1024*1024*100,
'backupCount': 7,
'filename': ANSIBLE_LOG_FILE, 'filename': ANSIBLE_LOG_FILE,
}, },
'gunicorn_logs': {
'encoding': 'utf8',
'level': 'DEBUG',
'class': 'logging.handlers.RotatingFileHandler',
'formatter': 'main',
'maxBytes': 1024*1024*100,
'backupCount': 2,
'filename': GUNICORN_LOG_FILE,
},
}, },
'loggers': { 'loggers': {
'django': { 'django': {
@ -254,6 +266,10 @@ LOGGING = {
'handlers': ['console', 'file'], 'handlers': ['console', 'file'],
'level': "INFO", 'level': "INFO",
}, },
'gunicorn': {
'handlers': ['console', 'gunicorn_logs'],
'level': LOG_LEVEL,
},
# 'django.db': { # 'django.db': {
# 'handlers': ['console', 'file'], # 'handlers': ['console', 'file'],
# 'level': 'DEBUG' # 'level': 'DEBUG'
@ -428,7 +444,7 @@ CELERY_WORKER_LOG_FORMAT = '%(message)s'
CELERY_TASK_EAGER_PROPAGATES = True CELERY_TASK_EAGER_PROPAGATES = True
CELERY_WORKER_REDIRECT_STDOUTS = True CELERY_WORKER_REDIRECT_STDOUTS = True
CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = "INFO" CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = "INFO"
# CELERY_WORKER_HIJACK_ROOT_LOGGER = False # CELERY_WORKER_HIJACK_ROOT_LOGGER = True
CELERY_WORKER_MAX_TASKS_PER_CHILD = 40 CELERY_WORKER_MAX_TASKS_PER_CHILD = 40
# Cache use redis # Cache use redis

10
apps/ops/celery/signal_handler.py
View File

@ -5,7 +5,7 @@ import logging
from django.core.cache import cache from django.core.cache import cache
from celery import subtask from celery import subtask
from celery.signals import ( from celery.signals import (
worker_ready, worker_shutdown, after_setup_logger worker_ready, worker_shutdown, after_setup_logger, setup_logging
) )
from kombu.utils.encoding import safe_str from kombu.utils.encoding import safe_str
from django_celery_beat.models import PeriodicTask from django_celery_beat.models import PeriodicTask
@ -45,8 +45,8 @@ def after_app_shutdown_periodic_tasks(sender=None, **kwargs):
def add_celery_logger_handler(sender=None, logger=None, loglevel=None, format=None, **kwargs): def add_celery_logger_handler(sender=None, logger=None, loglevel=None, format=None, **kwargs):
if not logger: if not logger:
return return
handler = CeleryTaskFileHandler() task_handler = CeleryTaskFileHandler()
handler.setLevel(loglevel) task_handler.setLevel(loglevel)
formatter = logging.Formatter(format) formatter = logging.Formatter(format)
handler.setFormatter(formatter) task_handler.setFormatter(formatter)
logger.addHandler(handler) logger.addHandler(task_handler)

1
jms
View File

@ -149,7 +149,6 @@ def start_gunicorn():
if DAEMON: if DAEMON:
cmd.extend([ cmd.extend([
'--access-logfile', log_file,
'--daemon', '--daemon',
]) ])
else: else: