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
05e7311b
Commit
05e7311b
authored
5 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 1.5.5
parents
3f1e75c6
f40d51c8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
system_user.py
apps/assets/api/system_user.py
+3
-2
settings.py
apps/jumpserver/settings.py
+1
-1
No files found.
apps/assets/api/system_user.py
View file @
05e7311b
...
...
@@ -14,11 +14,12 @@
# limitations under the License.
from
django.shortcuts
import
get_object_or_404
from
django.conf
import
settings
from
rest_framework.response
import
Response
from
common.serializers
import
CeleryTaskSerializer
from
common.utils
import
get_logger
from
common.permissions
import
IsOrgAdmin
,
IsOrgAdminOrAppUser
from
common.permissions
import
IsOrgAdmin
,
IsOrgAdminOrAppUser
,
IsAppUser
from
orgs.mixins.api
import
OrgBulkModelViewSet
from
orgs.mixins
import
generics
from
..models
import
SystemUser
,
Asset
...
...
@@ -69,7 +70,7 @@ class SystemUserAssetAuthInfoApi(generics.RetrieveAPIView):
Get system user with asset auth info
"""
model
=
SystemUser
permission_classes
=
(
Is
OrgAdminOr
AppUser
,)
permission_classes
=
(
IsAppUser
,)
serializer_class
=
serializers
.
SystemUserAuthSerializer
def
get_object
(
self
):
...
...
This diff is collapsed.
Click to expand it.
apps/jumpserver/settings.py
View file @
05e7311b
...
...
@@ -518,7 +518,7 @@ CELERY_TASK_EAGER_PROPAGATES = True
CELERY_WORKER_REDIRECT_STDOUTS
=
True
CELERY_WORKER_REDIRECT_STDOUTS_LEVEL
=
"INFO"
# CELERY_WORKER_HIJACK_ROOT_LOGGER = True
CELERY_WORKER_MAX_TASKS_PER_CHILD
=
40
#
CELERY_WORKER_MAX_TASKS_PER_CHILD = 40
CELERY_TASK_SOFT_TIME_LIMIT
=
3600
# Cache use redis
...
...
This diff is collapsed.
Click to expand it.
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