Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
15f6d5c9
Commit
15f6d5c9
authored
Dec 07, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] terminal tasks main()运行时,可能数据库还不存在
parent
ec8106e4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
9 deletions
+21
-9
tasks.py
apps/terminal/tasks.py
+14
-7
clean_migrations.sh
utils/clean_migrations.sh
+7
-2
No files found.
apps/terminal/tasks.py
View file @
15f6d5c9
...
...
@@ -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
()
utils/clean_migrations.sh
View file @
15f6d5c9
#!/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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment