diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2017-01-06 11:56:41 -0600 |
---|---|---|
committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-01-30 12:57:25 -0600 |
commit | f477fe2945bdbd24817bdc690c17242e30069f4f (patch) | |
tree | f93677ed96095e7f622400f75d41dd25778144a0 /log_manager_main.cpp | |
parent | 88d7cf8da4a7213e4f91d3eca35ec6a2fd8f9ca0 (diff) | |
download | phosphor-logging-f477fe2945bdbd24817bdc690c17242e30069f4f.tar.gz phosphor-logging-f477fe2945bdbd24817bdc690c17242e30069f4f.zip |
log_manager: Cleanup main function
The design direction changed after the commit that added the
log_manager main function, so updating it to the correct usage.
Change-Id: I88459fb65ba6b8272f0f9f85b55f9f837487ffea
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'log_manager_main.cpp')
-rw-r--r-- | log_manager_main.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/log_manager_main.cpp b/log_manager_main.cpp index c5e426b..10b6e76 100644 --- a/log_manager_main.cpp +++ b/log_manager_main.cpp @@ -1,22 +1,27 @@ +#include <sdbusplus/bus.hpp> +#include <sdbusplus/server/manager.hpp> #include "config.h" #include "log_manager.hpp" -#include <sdbusplus/bus.hpp> -#include <cstdlib> -#include <iostream> -#include <exception> int main(int argc, char *argv[]) { - try { - auto manager = phosphor::logging::Manager( - sdbusplus::bus::new_system(), - BUSNAME_LOGGING, - OBJ_INTERNAL); - manager.run(); - exit(EXIT_SUCCESS); - } - catch (const std::exception &e) { - std::cerr << e.what() << std::endl; + auto bus = sdbusplus::bus::new_default(); + + // Add sdbusplus ObjectManager. + sdbusplus::server::manager::manager objManager(bus, OBJ_INTERNAL); + + phosphor::logging::Manager manager(bus, OBJ_INTERNAL); + + bus.request_name(BUSNAME_LOGGING); + + // TODO Create error log dbus object on demand, when the Commit interface + // creates an error log it'd call this entry interface to create an object. + + while(true) + { + bus.process_discard(); + bus.wait(); } - exit(EXIT_FAILURE); + + return 0; } |