Skip to content

J
jumpserver
Unverified Commit 67b21f04 authored by 老广's avatar 老广 Committed by GitHub
Browse files
Options

Merge pull request #2254 from jumpserver/dev 

Dev
parents a14d6b29 e15c9e65
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
apps/common/utils.py
View file @ 67b21f04
...@@ -391,6 +391,8 @@ def get_request_ip(request): ...@@ -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(): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment