Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
29eea03d
authored
Aug 18, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fix update_agent()
parent
da2b020d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
circle/vm/tasks/local_agent_tasks.py
+6
-5
No files found.
circle/vm/tasks/local_agent_tasks.py
View file @
29eea03d
...
@@ -86,7 +86,7 @@ def agent_started(vm, version=None):
...
@@ -86,7 +86,7 @@ def agent_started(vm, version=None):
if
version
and
version
!=
settings
.
AGENT_VERSION
:
if
version
and
version
!=
settings
.
AGENT_VERSION
:
try
:
try
:
update_agent
(
vm
,
instance
,
act
)
update_agent
(
instance
,
act
)
except
TimeoutError
:
except
TimeoutError
:
pass
pass
else
:
else
:
...
@@ -134,9 +134,9 @@ def agent_stopped(vm):
...
@@ -134,9 +134,9 @@ def agent_stopped(vm):
pass
pass
def
update_agent
(
instance
,
vm
,
act
=
None
):
def
update_agent
(
instance
,
act
=
None
):
if
act
:
if
act
:
act
.
sub_activity
(
act
=
act
.
sub_activity
(
'update'
,
'update'
,
readable_name
=
create_readable
(
readable_name
=
create_readable
(
ugettext_noop
(
'update to
%(version)
s'
),
ugettext_noop
(
'update to
%(version)
s'
),
...
@@ -150,5 +150,6 @@ def update_agent(instance, vm, act=None):
...
@@ -150,5 +150,6 @@ def update_agent(instance, vm, act=None):
version
=
settings
.
AGENT_VERSION
))
version
=
settings
.
AGENT_VERSION
))
with
act
:
with
act
:
queue
=
instance
.
get_remote_queue_name
(
"agent"
)
queue
=
instance
.
get_remote_queue_name
(
"agent"
)
update
.
apply_async
(
queue
=
queue
,
update
.
apply_async
(
args
=
(
vm
,
create_agent_tar
()))
.
get
(
timeout
=
10
)
queue
=
queue
,
args
=
(
instance
.
vm_name
,
create_agent_tar
()))
.
get
(
timeout
=
10
)
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