mirror of https://github.com/jumpserver/jumpserver
[Bugfix] terminal tasks main()运行时,可能数据库还不存在
parent
ec8106e43d
commit
15f6d5c9c0
|
@ -5,10 +5,12 @@ import time
|
|||
|
||||
from celery import shared_task
|
||||
from django.core.cache import cache
|
||||
from django.db.utils import ProgrammingError
|
||||
|
||||
from .models import Session
|
||||
|
||||
|
||||
|
||||
ASSETS_CACHE_KEY = "terminal__session__assets"
|
||||
USERS_CACHE_KEY = "terminal__session__users"
|
||||
SYSTEM_USER_CACHE_KEY = "terminal__session__system_users"
|
||||
|
@ -36,14 +38,18 @@ def get_session_system_user_list():
|
|||
|
||||
def set_cache():
|
||||
while True:
|
||||
assets = get_session_asset_list()
|
||||
users = get_session_user_list()
|
||||
system_users = get_session_system_user_list()
|
||||
try:
|
||||
assets = get_session_asset_list()
|
||||
users = get_session_user_list()
|
||||
system_users = get_session_system_user_list()
|
||||
|
||||
cache.set(ASSETS_CACHE_KEY, assets)
|
||||
cache.set(USERS_CACHE_KEY, users)
|
||||
cache.set(SYSTEM_USER_CACHE_KEY, system_users)
|
||||
time.sleep(10)
|
||||
cache.set(ASSETS_CACHE_KEY, assets)
|
||||
cache.set(USERS_CACHE_KEY, users)
|
||||
cache.set(SYSTEM_USER_CACHE_KEY, system_users)
|
||||
except ProgrammingError:
|
||||
pass
|
||||
finally:
|
||||
time.sleep(10)
|
||||
|
||||
|
||||
def main():
|
||||
|
@ -59,4 +65,5 @@ def main():
|
|||
t.start()
|
||||
RUNNING = True
|
||||
|
||||
# Todo: 不能migrations了
|
||||
main()
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
|
||||
for app in users assets perms audits ops applications;do
|
||||
rm -f ../apps/$app/migrations/00*
|
||||
cd ../apps
|
||||
|
||||
for d in $(ls);do
|
||||
if [ -d $d ] && [ -d $d/migrations ];then
|
||||
rm -f $d/migrations/00*
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in New Issue