Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jhub
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jupyterjsc
k8s
images
jhub
Commits
dba1d76b
Commit
dba1d76b
authored
2 years ago
by
Tim Kreuzer
Browse files
Options
Downloads
Plain Diff
Merge branch 'kreuzer1-main-patch-69070' into 'main'
fix self.events type for 2.1.1 See merge request
!31
parents
22d3e5a5
c70dd970
No related branches found
No related tags found
1 merge request
!31
fix self.events type for 2.1.1
Pipeline
#116683
passed
2 years ago
Stage: build-tag
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
custom/2.1.1/spawner/spawner.py
+5
-1
5 additions, 1 deletion
custom/2.1.1/spawner/spawner.py
with
5 additions
and
1 deletion
custom/2.1.1/spawner/spawner.py
+
5
−
1
View file @
dba1d76b
...
@@ -53,6 +53,8 @@ class BackendSpawner(Spawner):
...
@@ -53,6 +53,8 @@ class BackendSpawner(Spawner):
if
self
.
start_id
:
if
self
.
start_id
:
state
[
"
start_id
"
]
=
self
.
start_id
state
[
"
start_id
"
]
=
self
.
start_id
if
self
.
events
:
if
self
.
events
:
if
type
(
self
.
events
)
!=
dict
:
self
.
events
=
{}
self
.
events
[
"
latest
"
]
=
self
.
latest_events
self
.
events
[
"
latest
"
]
=
self
.
latest_events
# Clear logs older than 24h or empty logs
# Clear logs older than 24h or empty logs
events_keys
=
copy
.
deepcopy
(
list
(
self
.
events
.
keys
()))
events_keys
=
copy
.
deepcopy
(
list
(
self
.
events
.
keys
()))
...
@@ -189,7 +191,9 @@ class BackendSpawner(Spawner):
...
@@ -189,7 +191,9 @@ class BackendSpawner(Spawner):
f
"
Could not retrieve latest_events. Reset events list for
{
self
.
_log_name
}
"
f
"
Could not retrieve latest_events. Reset events list for
{
self
.
_log_name
}
"
)
)
self
.
latest_events
=
[]
self
.
latest_events
=
[]
self
.
events
=
[]
self
.
events
=
{}
if
type
(
self
.
events
)
!=
dict
:
self
.
events
=
{}
# Reset latest events only
# Reset latest events only
self
.
latest_events
=
[]
self
.
latest_events
=
[]
self
.
events
[
"
latest
"
]
=
self
.
latest_events
self
.
events
[
"
latest
"
]
=
self
.
latest_events
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment