Merge pull request #10959 from jumpserver/pr@dev@perf_add_url

perf: 修改 log 的位置

.dockerignore

@@ -1,5 +1,4 @@
 .git
-logs/*
 data/*
 .github
 tmp/*

.gitignore

@@ -35,7 +35,6 @@ celerybeat-schedule.db
 docs/_build/
 xpack
 xpack.bak
-logs/*
 ### Vagrant ###
 .vagrant/
 release/*

apps/common/management/commands/services/hands.py

@@ -1,12 +1,14 @@
+import logging
 import os
 import sys
-import logging
+
 from django.conf import settings
 
 from apps.jumpserver.const import CONFIG
 
 try:
     from apps.jumpserver import const
+
     __version__ = const.VERSION
 except ImportError as e:
     print("Not found __version__: {}".format(e))
@@ -15,12 +17,11 @@ except ImportError as e:
     __version__ = 'Unknown'
     sys.exit(1)
 
-
 HTTP_HOST = CONFIG.HTTP_BIND_HOST or '127.0.0.1'
 HTTP_PORT = CONFIG.HTTP_LISTEN_PORT or 8080
 WS_PORT = CONFIG.WS_LISTEN_PORT or 8082
 DEBUG = CONFIG.DEBUG or False
 BASE_DIR = os.path.dirname(settings.BASE_DIR)
-LOG_DIR = os.path.join(BASE_DIR, 'logs')
+LOG_DIR = os.path.join(BASE_DIR, 'data', 'logs')
 APPS_DIR = os.path.join(BASE_DIR, 'apps')
 TMP_DIR = os.path.join(BASE_DIR, 'tmp')

apps/jumpserver/conf.py

@@ -187,7 +187,7 @@ class Config(dict):
         'DEBUG': False,
         'DEBUG_DEV': False,
         'LOG_LEVEL': 'DEBUG',
-        'LOG_DIR': os.path.join(PROJECT_DIR, 'logs'),
+        'LOG_DIR': os.path.join(PROJECT_DIR, 'data', 'logs'),
         'DB_ENGINE': 'mysql',
         'DB_NAME': 'jumpserver',
         'DB_HOST': '127.0.0.1',

apps/jumpserver/settings/logging.py

@@ -4,7 +4,7 @@ import os
 
 from ..const import PROJECT_DIR, CONFIG
 
-LOG_DIR = os.path.join(PROJECT_DIR, 'logs')
+LOG_DIR = os.path.join(PROJECT_DIR, 'data', 'logs')
 JUMPSERVER_LOG_FILE = os.path.join(LOG_DIR, 'jumpserver.log')
 DRF_EXCEPTION_LOG_FILE = os.path.join(LOG_DIR, 'drf_exception.log')
 UNEXPECTED_EXCEPTION_LOG_FILE = os.path.join(LOG_DIR, 'unexpected_exception.log')

apps/jumpserver/urls.py

@@ -1,12 +1,12 @@
 # ~*~ coding: utf-8 ~*~
 from __future__ import unicode_literals
+
 import os
 
 import private_storage.urls
-
-from django.urls import path, include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
+from django.urls import path, include, re_path
 from django.views.i18n import JavaScriptCatalog
 
 from . import views, api
@@ -64,6 +64,9 @@ urlpatterns += [
     # Protect media
     path('media/', include(private_storage.urls)),
 ]
+if settings.DEBUG:
+    urlpatterns += static('/luna/', document_root=(settings.DATA_DIR + '/luna'))
+    urlpatterns += static('/lina/', document_root=(settings.DATA_DIR + '/lina'))
 
 # js i18n 路由文件
 urlpatterns += [

apps/manage.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 import os
 import sys
-import errno
 
 if __name__ == "__main__":
     try:
-        os.makedirs('../logs')
+        os.makedirs('../data/logs')
     except:
         pass
 

logs/.gitkeep

@@ -1 +0,0 @@
-