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
6586bef8
Commit
6586bef8
authored
Dec 30, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Modify] Add access log
parent
e0a3fafb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
asset.py
apps/assets/models/asset.py
+3
-3
signals_handler.py
apps/assets/signals_handler.py
+0
-1
asset.py
apps/assets/views/asset.py
+4
-4
run_server.py
run_server.py
+6
-1
No files found.
apps/assets/models/asset.py
View file @
6586bef8
...
...
@@ -33,9 +33,9 @@ class Asset(models.Model):
(
'Storage'
,
_
(
"Storage"
)),
)
ENV_CHOICES
=
(
(
'Prod'
,
'Production'
),
(
'Dev'
,
'Development'
),
(
'Test'
,
'Testing'
),
(
'Prod'
,
_
(
'Production'
)
),
(
'Dev'
,
_
(
'Development'
)
),
(
'Test'
,
_
(
'Testing'
)
),
)
# Important
...
...
apps/assets/signals_handler.py
View file @
6586bef8
...
...
@@ -76,7 +76,6 @@ def on_system_user_created_or_updated(sender, instance=None, **kwargs):
@receiver
(
post_init
,
sender
=
Cluster
,
dispatch_uid
=
"my_unique_identifier"
)
def
on_cluster_init
(
sender
,
instance
,
**
kwargs
):
logger
.
debug
(
"On cluster init"
)
instance
.
__original_assets
=
tuple
(
instance
.
assets
.
values_list
(
'pk'
,
flat
=
True
))
# instance.__origin_system_users = tuple(instance.systemuser_set.all())
...
...
apps/assets/views/asset.py
View file @
6586bef8
...
...
@@ -44,8 +44,8 @@ class AssetListView(AdminUserRequiredMixin, TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
'app'
:
'Assets'
,
'action'
:
'Asset list'
,
'app'
:
_
(
'Assets'
)
,
'action'
:
_
(
'Asset list'
)
,
# 'groups': AssetGroup.objects.all(),
'system_users'
:
SystemUser
.
objects
.
all
(),
}
...
...
@@ -58,8 +58,8 @@ class UserAssetListView(LoginRequiredMixin, TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
{
'app'
:
'Assets'
,
'action'
:
'Asset list'
,
'app'
:
_
(
'Assets'
)
,
'action'
:
_
(
'Asset list'
)
,
'system_users'
:
SystemUser
.
objects
.
all
(),
}
kwargs
.
update
(
context
)
...
...
run_server.py
View file @
6586bef8
...
...
@@ -51,7 +51,12 @@ def start_gunicorn():
make_migrations
()
collect_static
()
os
.
chdir
(
APPS_DIR
)
cmd
=
"gunicorn jumpserver.wsgi -b {}:{} -w {}"
.
format
(
HTTP_HOST
,
HTTP_PORT
,
WORKERS
)
cmd
=
"gunicorn jumpserver.wsgi -b {}:{} -w {} "
.
format
(
HTTP_HOST
,
HTTP_PORT
,
WORKERS
)
log_format
=
'
%(h)
s
%(t)
s "
%(r)
s"
%(s)
s
%(b)
s '
log
=
" --access-logfile - --access-logformat '{}' "
.
format
(
log_format
)
cmd
+=
log
if
DEBUG
:
cmd
+=
" --reload"
p
=
subprocess
.
Popen
(
cmd
,
shell
=
True
,
stdout
=
sys
.
stdout
,
stderr
=
sys
.
stderr
)
...
...
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