GitLab maintenance scheduled for Today, 2019-12-05, from 17:00 to 18:00 CT - Services will be unavailable during this time.

Commit a09400ed authored by Kamil Iskra's avatar Kamil Iskra

Merge branch 'delete-fix' into 'master'

Delete fix

Closes #1

See merge request !4
parents 2fc34abb 51af8112
......@@ -647,6 +647,7 @@ bool parse_for_node_config(int argc, char** argv, Container_manager& cm)
{
case OV_HELP:
case OV_ON_ERROR:
case OV_LOG:
break; //handled elsewhere
case OV_SHOW_AVAILABLE_RESOURCES:
cm.show_available_resources(optarg ? optarg : "");
......
......@@ -579,6 +579,7 @@ void Container_manager::delete_container(string command)
sleep(1);
cc->remove();
bool deleted = false;
vector<Argo_container*>::iterator it;
for(it = _containers.begin(); it != _containers.end(); it++)
{
......@@ -589,10 +590,11 @@ void Container_manager::delete_container(string command)
_logger->log(LOG_TYPE_INFO, "Container " + cc->get_name()
+ " deleted.");
delete cc;
deleted = true;
break;
}
}
assert(_containers.empty() || it != _containers.end());
assert(deleted);
}
void Container_manager::alter_container(string command)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment