Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
slapos.core
Commits
d1c03593
Commit
d1c03593
authored
Mar 17, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: Bang after request destroy, to ensure the whole Hosting Subscription is processed
parent
fa0ebacf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSCloud.py
...plateItem/portal_components/extension.erp5.SlapOSCloud.py
+10
-2
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSecurity.xml
...eItem/portal_components/extension.erp5.SlapOSSecurity.xml
+1
-0
No files found.
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSCloud.py
View file @
d1c03593
...
@@ -62,7 +62,7 @@ def SoftwareInstance_renameAndRequestDestroy(self, REQUEST=None):
...
@@ -62,7 +62,7 @@ def SoftwareInstance_renameAndRequestDestroy(self, REQUEST=None):
if
REQUEST
is
not
None
:
if
REQUEST
is
not
None
:
raise
Unauthorized
raise
Unauthorized
assert
self
.
getPortalType
()
in
[
"Software Instance"
,
"Slave Instance"
]
assert
self
.
getPortalType
()
in
[
"Software Instance"
,
"Slave Instance"
]
title
=
self
.
getTitle
()
title
=
self
.
getTitle
()
new_title
=
title
+
"_renamed_and_destroyed_%s"
%
(
DateTime
().
strftime
(
"%Y%m%d_%H%M%S"
))
new_title
=
title
+
"_renamed_and_destroyed_%s"
%
(
DateTime
().
strftime
(
"%Y%m%d_%H%M%S"
))
self
.
rename
(
new_name
=
new_title
,
self
.
rename
(
new_name
=
new_title
,
...
@@ -85,4 +85,12 @@ def SoftwareInstance_renameAndRequestDestroy(self, REQUEST=None):
...
@@ -85,4 +85,12 @@ def SoftwareInstance_renameAndRequestDestroy(self, REQUEST=None):
for
name
in
[
title
,
new_title
]:
for
name
in
[
title
,
new_title
]:
# reset request cache
# reset request cache
key
=
'_'
.
join
([
hosting_subscription
,
name
])
key
=
'_'
.
join
([
hosting_subscription
,
name
])
self
.
getPortalObject
().
portal_slap
.
_storeLastData
(
key
,
{})
self
.
getPortalObject
().
portal_slap
.
_storeLastData
(
key
,
{})
\ No newline at end of file
# Them call bang to enforce tree to reprocess.
timestamp
=
str
(
int
(
self
.
getModificationDate
()))
key
=
"%s_bangstamp"
%
self
.
getReference
()
if
(
self
.
portal_slap
.
_getLastData
(
key
)
!=
timestamp
):
self
.
bang
(
bang_tree
=
True
,
comment
=
"Instance was destroyed."
)
self
.
portal_slap
.
_storeLastData
(
key
,
str
(
int
(
self
.
getModificationDate
())))
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSecurity.xml
View file @
d1c03593
...
@@ -120,6 +120,7 @@
...
@@ -120,6 +120,7 @@
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
<none/>
</tuple>
</tuple>
</pickle>
</pickle>
</record>
</record>
...
...
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