jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmds/launch: start session manager if not already running

Browse source
This commit is contained in:
Simon Fels 2017-05-02 07:23:18 +02:00
commit d2eae3a832
1 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/anbox/cmds/launch.cpp
View file

@ -26,12 +26,16 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "core/posix/exec.h"
#include "core/posix/fork.h"
#include "core/posix/signal.h" #include "core/posix/signal.h"
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
namespace { namespace {
const boost::posix_time::seconds max_wait_timeout{30}; const boost::posix_time::seconds max_wait_timeout{30};
const unsigned int max_restart_attempts{3};
const std::chrono::seconds restart_interval{1};
} }
anbox::cmds::Launch::Launch() anbox::cmds::Launch::Launch()
@ -69,11 +73,47 @@ anbox::cmds::Launch::Launch()
auto bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session); auto bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session);
bus->install_executor(core::dbus::asio::make_executor(bus, rt->service())); bus->install_executor(core::dbus::asio::make_executor(bus, rt->service()));
// Instead of relying on the user session init system to start our
// session manager process we also attempt to start it on 0our own
// if not already running. This will help to mitigate problems with
// a crashing or a not yet started session manager instance.
std::shared_ptr<dbus::stub::ApplicationManager> stub; std::shared_ptr<dbus::stub::ApplicationManager> stub;
try { for (auto n = 0; n < max_restart_attempts; n++) {
stub = dbus::stub::ApplicationManager::create_for_bus(bus); try {
} catch (...) { stub = dbus::stub::ApplicationManager::create_for_bus(bus);
ERROR("Anbox session manager service isn't running!"); } catch (std::exception &err) {
WARNING("Anbox session manager service isn't running, trying to start it.");
std::vector<std::string> args = {"session-manager"};
std::map<std::string,std::string> env;
core::posix::this_process::env::for_each([&](const std::string &name, const std::string &value) {
env.insert({name, value});
});
const auto exe_path = utils::process_get_exe_path(::getpid());
try {
const auto flags = core::posix::StandardStream::stdout | core::posix::StandardStream::stderr;
auto child = core::posix::fork([&]() {
auto grandchild = core::posix::exec(exe_path, args, env, flags);
grandchild.dont_kill_on_cleanup();
return core::posix::exit::Status::success;
}, flags);
child.wait_for(core::posix::wait::Flags::untraced);
DEBUG("Started session manager, will now try to connect ..");
}
catch (...) {
ERROR("Failed to start session manager instance");
}
}
std::this_thread::sleep_for(restart_interval);
}
if (!stub) {
ERROR("Couldn't get a connection with the session manager");
return EXIT_FAILURE; return EXIT_FAILURE;
} }