github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2254 from jumpserver/dev 

Dev
pull/2328/head
老广 2018-12-21 15:58:56 +08:00 committed by GitHub
parent a14d6b298d e15c9e6588
commit 67b21f0489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/utils.py
View File

@ -391,6 +391,8 @@ def get_request_ip(request):
def get_command_storage_setting(): def get_command_storage_setting():
default = settings.DEFAULT_TERMINAL_COMMAND_STORAGE default = settings.DEFAULT_TERMINAL_COMMAND_STORAGE
value = settings.TERMINAL_COMMAND_STORAGE value = settings.TERMINAL_COMMAND_STORAGE
if not value:
return default
value.update(default) value.update(default)
return value return value
@ -398,6 +400,8 @@ def get_command_storage_setting():
def get_replay_storage_setting(): def get_replay_storage_setting():
default = settings.DEFAULT_TERMINAL_REPLAY_STORAGE default = settings.DEFAULT_TERMINAL_REPLAY_STORAGE
value = settings.TERMINAL_REPLAY_STORAGE value = settings.TERMINAL_REPLAY_STORAGE
if not value:
return default
value.update(default) value.update(default)
return value return value