Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c9fa8b10
authored
Mar 11, 2013
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cloud: fix email address
parent
bf7eacee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cloud/settings.py
+1
-1
one/jobs/hourly/scheduled_vm_cleanup.py
+3
-3
No files found.
cloud/settings.py
View file @
c9fa8b10
...
@@ -5,7 +5,7 @@ DEBUG = True
...
@@ -5,7 +5,7 @@ DEBUG = True
TEMPLATE_DEBUG
=
DEBUG
TEMPLATE_DEBUG
=
DEBUG
ADMINS
=
(
ADMINS
=
(
(
'IK'
,
'cloud@i
it
.bme.hu'
),
(
'IK'
,
'cloud@i
k
.bme.hu'
),
)
)
MANAGERS
=
ADMINS
MANAGERS
=
ADMINS
...
...
one/jobs/hourly/scheduled_vm_cleanup.py
View file @
c9fa8b10
...
@@ -9,7 +9,6 @@ from django.utils.translation import ugettext_lazy as _
...
@@ -9,7 +9,6 @@ from django.utils.translation import ugettext_lazy as _
from
cloud.settings
import
CLOUD_URL
as
url
from
cloud.settings
import
CLOUD_URL
as
url
from
django.utils
import
translation
from
django.utils
import
translation
class
Job
(
HourlyJob
):
class
Job
(
HourlyJob
):
help
=
"Suspend/delete expired Instances."
help
=
"Suspend/delete expired Instances."
...
@@ -34,8 +33,9 @@ class Job(HourlyJob):
...
@@ -34,8 +33,9 @@ class Job(HourlyJob):
translation
.
activate
(
i
.
owner
.
person_set
.
get
()
.
language
)
translation
.
activate
(
i
.
owner
.
person_set
.
get
()
.
language
)
except
:
except
:
pass
pass
print
"
%
s delete:
%
s"
%
(
i
.
name
,
i
.
time_of_delete
)
print
u'
%
s delete:
%
s'
%
(
i
.
name
,
i
.
time_of_delete
)
delete
=
i
.
time_of_delete
.
replace
(
minute
=
0
,
second
=
0
,
microsecond
=
0
)
delete
=
i
.
time_of_delete
.
replace
(
minute
=
0
,
second
=
0
,
microsecond
=
0
)
continue
if
i
.
time_of_delete
<
now
:
if
i
.
time_of_delete
<
now
:
# msg = render_to_string('mails/notification-delete-now.txt', { 'user': i.owner, 'instance': i, 'url': url } )
# msg = render_to_string('mails/notification-delete-now.txt', { 'user': i.owner, 'instance': i, 'url': url } )
# SendMailTask.delay(to=i.owner.email, subject='[IK Cloud] %s' % i.name, msg=msg)
# SendMailTask.delay(to=i.owner.email, subject='[IK Cloud] %s' % i.name, msg=msg)
...
@@ -52,7 +52,7 @@ class Job(HourlyJob):
...
@@ -52,7 +52,7 @@ class Job(HourlyJob):
translation
.
activate
(
i
.
owner
.
person_set
.
get
()
.
language
)
translation
.
activate
(
i
.
owner
.
person_set
.
get
()
.
language
)
except
:
except
:
pass
pass
print
"
%
s suspend:
%
s"
%
(
i
.
name
,
i
.
time_of_suspend
)
print
u'
%
s suspend:
%
s'
%
(
i
.
name
,
i
.
time_of_suspend
)
suspend
=
i
.
time_of_suspend
.
replace
(
minute
=
0
,
second
=
0
,
microsecond
=
0
)
suspend
=
i
.
time_of_suspend
.
replace
(
minute
=
0
,
second
=
0
,
microsecond
=
0
)
if
i
.
time_of_suspend
<
now
:
if
i
.
time_of_suspend
<
now
:
...
...
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