diff --git a/src/container_manager.cpp b/src/container_manager.cpp index f830fa243555132b80afa30fe7366bee0df4db28..d79ccedfd95239d85b65239f872b9dd935f27aa8 100644 --- a/src/container_manager.cpp +++ b/src/container_manager.cpp @@ -275,7 +275,7 @@ void Container_manager::create_root_cgroups() void Container_manager::migrate_service_os() { - system("for t in `cat /sys/fs/cgroup/cpuset/tasks`; do /bin/echo $t > /sys/fs/cgroup/cpuset/argo/service_os/tasks; done 2>/dev/null"); + int n = system("for t in `cat /sys/fs/cgroup/cpuset/tasks`; do /bin/echo $t > /sys/fs/cgroup/cpuset/argo/service_os/tasks; done 2>/dev/null"); return; vector sos_tasks; retrieve_from_file( _cgroup_root + "cpuset/tasks", @@ -375,6 +375,9 @@ void Container_manager::load_existing_containers_as_root() Container_manager::~Container_manager() +#if __cplusplus >= 201103L + noexcept(false) +#endif { std::ofstream ownership_map_file; ownership_map_file.open(OWNERSHIP_MAP); @@ -853,7 +856,7 @@ void Container_manager::reset() clean_config(""); /*Temporary ugly brutal hack [JZ] (\_/)*/ - system("rmdir /sys/fs/cgroup/cpuset/argo/argo_containers/ && rmdir /sys/fs/cgroup/cpuset/argo/"); + int n = system("rmdir /sys/fs/cgroup/cpuset/argo/argo_containers/ && rmdir /sys/fs/cgroup/cpuset/argo/"); } void Container_manager::attach_to_container(string command) diff --git a/src/container_manager.hpp b/src/container_manager.hpp index 754c5e7bb2cd5d947c6650f583a819a3693db9b2..e554c15c616f24df6486066c396a1689be5192cf 100644 --- a/src/container_manager.hpp +++ b/src/container_manager.hpp @@ -223,7 +223,11 @@ class Container_manager Container_manager(ILogger* logger, Error_behavior error_behavior, string cgroup_root = DEFAULT_CGROUP_ROOT); - ~Container_manager(); + ~Container_manager() +#if __cplusplus >= 201103L + noexcept(false) +#endif + ; inline const string* const get_argo_argo_container_root() const {return &_cgroup_root;} inline Error_behavior get_error_behaviour()const {return _error_behavior;} diff --git a/src/syslogger.cpp b/src/syslogger.cpp index 1dc46b3fa471f5ba15c8c81d74c792131a16fd55..047d3c465892c3b722b6684e8677650cde0acfbb 100644 --- a/src/syslogger.cpp +++ b/src/syslogger.cpp @@ -39,5 +39,5 @@ void Syslogger::log(Log_type type, const string& message, int errnum) { string msg_out; if(prepare_log(type, message, msg_out, errnum)) - syslog(log_type_to_priority(type), msg_out.c_str()); + syslog(log_type_to_priority(type), "%s", msg_out.c_str()); }