From 7e2fb834d8ba2eb3fd6453f135d3e8ef30c852c6 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 21 Jun 2015 00:53:28 +0200
Subject: o Using ends_with when checking for which app to launch too.
 sm-get-value: o Using the io code for writing samples

---
 apps/launcher.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'apps/launcher.cpp')

diff --git a/apps/launcher.cpp b/apps/launcher.cpp
index dc31abd..4c1f687 100644
--- a/apps/launcher.cpp
+++ b/apps/launcher.cpp
@@ -13,9 +13,12 @@ const po::options_description logging_options() {
     return desc;
 }
 
-void setup_logging(po::variables_map vm) {
+void setup_logging(string app_name) {
     Appender *console = new ConsoleAppender(true, true);
-    PatternLayout *layout = new PatternLayout(LOG4CPLUS_TEXT("%-5p" /*" %6r"*/ " %-20c %m%n"));
+
+    string pattern = string("%-5p ") /*"%6r "*/ + app_name + "/%-20c %m%n";
+
+    PatternLayout *layout = new PatternLayout(LOG4CPLUS_TEXT(pattern));
     console->setLayout(auto_ptr<Layout>(layout));
 
     Hierarchy &h = Logger::getDefaultHierarchy();
@@ -29,6 +32,7 @@ int launch_app(int argc, const char *argv[]) {
     po::options_description all("Options");
 
     auto all_options = all.add_options();
+    all_options("help", "This help message");
     app.add_options(all_options);
 
     all.add(logging_options());
@@ -54,9 +58,9 @@ int launch_app(int argc, const char *argv[]) {
             return EXIT_FAILURE;
         }
 
-        setup_logging(vm);
+        setup_logging(app.app_name);
 
-        Logger logger = Logger::getInstance(LOG4CPLUS_TEXT(app.app_name));
+        Logger logger = Logger::getInstance(LOG4CPLUS_TEXT("main"));
 
         app_execution execution(all, vm, logger);
 
@@ -85,7 +89,7 @@ int main(int argc, const char *argv[]) {
 
         app_name = argv[1];
         --argc;
-        argv = &argv[1];
+        ++argv;
     } else {
         app_name = argv[0];
     }
-- 
cgit v1.2.3