Merge lp:~alan-griffiths/mir/add-glog-logging into lp:~mir-team/mir/trunk

[Alan Griffiths]

logging, config: Add a glog based logging option

logging, config: Add a glog based logging option

Resubmitted after getting glog through MIR [MainInclusionProcess]

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:465
http://s-jenkins:8080/job/mir-ci/1125/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/mir-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1125/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1125//rebuild/?

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

we have to find an armhf package we can use before this lands. I don't seem to find an armhf package in:
"deb http://ports.ubuntu.com/ubuntu-ports/ quantal main restricted universe multiverse" (the sources.list line in the phone image)

could this be what we're waiting for?
https://launchpad.net/ubuntu/+source/google-glog

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

glog is in universe. We should be using a loggong package that's in main

review: Disapprove

[Alan Griffiths (alan-griffiths)]

> glog is in universe. We should be using a loggong package that's in main

There is no logging package in main. Have raised a MIR. Will resubmit when that's been addressed.

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/mir-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/98/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/98/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/97/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

i have to bump the android scripts and figure out why its not finding the glog library, i'll propose a branch to mp into this one about that. I'll block on myself with a 'needs fixing'

line 256/257, presumably we overload info because glog only has 4 levels?

line 98, is a bit chatty, for me, i see
...
-- Found GLog: /home/kdub/source/ndk-rewrite-glog/usr/lib/arm-linux-gnueabihf/libglog.so
-- Found LIBHARDWARE: /home/kdub/source/ndk-rewrite-glog/usr/lib/arm-linux-gnueabihf/libhardware.so.1
-- GLog_LIBRARY=/home/kdub/source/ndk-rewrite-glog/usr/lib/arm-linux-gnueabihf/libglog.so
...

review: Needs Fixing

[Kevin DuBois (kdub)]

the new dependency is now in raring, but not quantal. The phablet image at the moment is still quantal, so we'll either have to do an sru to update quantal, or install the raring package on the phablet device. I favor the 2nd (not that many more steps), so I'll update the scripts to do that

[Kevin DuBois (kdub)]

i updated our scripts and pulled the content of ndk-rewrite in here: lp:~mir-team/mir/consolidate-crossbuild-scripts (which has this glog dependency) I have to do some more testing on that branch and then explain the changes to the team.

[Kevin DuBois (kdub)]

sorry for the delay on that branch, will try to unblock this today!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/mir-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/95/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/174/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/173/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/mir-ci/175/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/99/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/176
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/176/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/175/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/mir-ci/183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/184
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/184/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/183/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/mir-ci/188/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/117/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/189
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/189/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/188/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/mir-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/121/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/191
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/191/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/190/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/mir-ci/191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/122/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/192
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/192/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/mir-ci/216/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/150/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/216/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/mir-ci/234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/176/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/235
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/235/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/39/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/234/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looking into it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/mir-ci/235/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/177/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/42

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/235/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/mir-ci/247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/248
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/247/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/mir-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/249
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/58

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/248/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks good to me, sorry for the delay on the android dependency.

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

I guess that when we standardize on a single logging system, we could drop glog references from the command line options.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/197
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/80/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/98
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-autolanding/98/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Failure looks like a glitch - reapproving

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-28 09:50:09 +0000
+++ CMakeLists.txt	2013-03-29 10:46:21 +0000
@@ -120,6 +120,7 @@
 find_package(EGL REQUIRED)
 find_package(GLESv2 REQUIRED)
 find_package(Protobuf REQUIRED )
+find_package(GLog REQUIRED)
 
 include_directories (${GLESv2_INCLUDE_DIRS})                                    
 include_directories (${EGL_INCLUDE_DIRS})

=== added file 'cmake/FindGLog.cmake'
--- cmake/FindGLog.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGLog.cmake	2013-03-29 10:46:21 +0000
@@ -0,0 +1,14 @@
+if (GLog_INCLUDE_DIR)
+  # Already in cache, be silent
+  set(GLog_FIND_QUIETLY TRUE)
+endif ()
+
+find_path(GLog_INCLUDE_DIR glog/logging.h)
+
+find_library(GLog_LIBRARY libglog.so
+             HINTS /usr/lib/arm-linux-gnueabihf/)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLog DEFAULT_MSG GLog_LIBRARY GLog_INCLUDE_DIR)
+
+mark_as_advanced(GLog_LIBRARY GLog_INCLUDE_DIR)

=== modified file 'cmake/FindLibHardware.cmake'
--- cmake/FindLibHardware.cmake	2013-03-13 04:54:15 +0000
+++ cmake/FindLibHardware.cmake	2013-03-29 10:46:21 +0000
@@ -19,7 +19,8 @@
 find_library(LIBHARDWARE_LIBRARY
    NAMES         libhardware.so.1 
                  libhardware.so 
-   )
+   HINTS /usr/lib/arm-linux-gnueabihf/
+)
 
 set(LIBHARDWARE_LIBRARIES ${LIBHARDWARE_LIBRARY})
 set(LIBHARDWARE_INCLUDE_DIRS ${LIBHARDWARE_INCLUDE_DIR})

=== modified file 'cmake/LinuxCrossCompile.cmake'
--- cmake/LinuxCrossCompile.cmake	2013-03-13 04:54:15 +0000
+++ cmake/LinuxCrossCompile.cmake	2013-03-29 10:46:21 +0000
@@ -15,11 +15,6 @@
 include_directories(SYSTEM ${MIR_NDK_PATH}/usr/include)
 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${MIR_NDK_PATH}/usr/include")
 
-#add directories from the chroot to search for libraries
-link_directories(${MIR_NDK_PATH}/lib/
-               ${MIR_ARM_EABI}/usr/lib
-               ${MIR_NDK_PATH}/usr/lib/${MIR_ARM_EABI})
-
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 set(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,-rpath-link,")

=== added file 'include/server/mir/logging/glog_logger.h'
--- include/server/mir/logging/glog_logger.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/logging/glog_logger.h	2013-03-29 10:46:21 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/logging/logger.h"
+
+namespace mir
+{
+namespace logging
+{
+class GlogLogger : public Logger
+{
+public:
+    GlogLogger(
+        char const* argv0,
+        int stderrthreshold,
+        int minloglevel,
+        std::string const& log_dir);
+
+private:
+    virtual void log(
+        Severity severity,
+        const std::string& message,
+        const std::string& component);
+};
+}
+}

=== modified file 'include/server/mir/logging/logger.h'
--- include/server/mir/logging/logger.h	2013-03-13 04:54:15 +0000
+++ include/server/mir/logging/logger.h	2013-03-29 10:46:21 +0000
@@ -39,8 +39,6 @@
         debug = 4
     };
 
-    virtual ~Logger() {}
-
     template<Severity severity>
     void log(const std::string& message)
     {
@@ -56,6 +54,7 @@
 
 protected:
     Logger() {}
+    virtual ~Logger() = default;
     Logger(const Logger&) = delete;
     Logger& operator=(const Logger&) = delete;
 

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-03-28 12:13:18 +0000
+++ src/server/CMakeLists.txt	2013-03-29 10:46:21 +0000
@@ -20,6 +20,9 @@
   ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
 )
 
+MESSAGE(STATUS "GLog_LIBRARY=" ${GLog_LIBRARY})
+MESSAGE(STATUS "GLog_LIBRARY=" ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
+
 set(
   SRCS
   run_mir.cpp
@@ -57,6 +60,7 @@
   mirprotobuf
   3rd_party
   ${Boost_LIBRARIES}
+  ${GLog_LIBRARY}
 )
 
 if(${MIRSERVER_LINKAGE} STREQUAL SHARED)

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-03-28 09:47:22 +0000
+++ src/server/default_server_configuration.cpp	2013-03-29 10:46:21 +0000
@@ -46,6 +46,7 @@
 #include "mir/input/input_manager.h"
 #include "mir/logging/logger.h"
 #include "mir/logging/dumb_console_logger.h"
+#include "mir/logging/glog_logger.h"
 #include "mir/logging/session_mediator_report.h"
 #include "mir/logging/message_processor_report.h"
 #include "mir/logging/display_report.h"
@@ -125,6 +126,11 @@
 char const* const log_msg_processor = "log-msg-processor";
 char const* const log_display      = "log-display";
 
+char const* const glog                 = "glog";
+char const* const glog_stderrthreshold = "glog-stderrthreshold";
+char const* const glog_minloglevel     = "glog-minloglevel";
+char const* const glog_log_dir         = "glog-log-dir";
+
 boost::program_options::options_description program_options()
 {
     namespace po = boost::program_options;
@@ -133,13 +139,26 @@
         "Command-line options.\n"
         "Environment variables capitalise long form with prefix \"MIR_SERVER_\" and \"_\" in place of \"-\"");
     desc.add_options()
-        ("file,f", po::value<std::string>(), "socket filename")
-        ("ipc-thread-pool,i", po::value<int>(), "threads in frontend thread pool")
-        (log_display, po::value<bool>(), "log the Display report")
-        (log_app_mediator, po::value<bool>(), "log the ApplicationMediator report")
+        ("file,f", po::value<std::string>(),    "Socket filename")
+        (log_display, po::value<bool>(),        "Log the Display report. [bool:default=false]")
+        (log_app_mediator, po::value<bool>(),   "Log the ApplicationMediator report. [bool:default=false]")
         (log_msg_processor, po::value<bool>(), "log the MessageProcessor report")
-        ("tests-use-real-graphics", po::value<bool>(), "use real graphics in tests")
-        ("tests-use-real-input", po::value<bool>(), "use real input in tests");
+        (glog,                                  "Use google::GLog for logging")
+        (glog_stderrthreshold, po::value<int>(),"Copy log messages at or above this level "
+                                                "to stderr in addition to logfiles. The numbers "
+                                                "of severity levels INFO, WARNING, ERROR, and "
+                                                "FATAL are 0, 1, 2, and 3, respectively."
+                                                " [int:default=2]")
+        (glog_minloglevel, po::value<int>(),    "Log messages at or above this level. The numbers "
+                                                "of severity levels INFO, WARNING, ERROR, and "
+                                                "FATAL are 0, 1, 2, and 3, respectively."
+                                                " [int:default=0]")
+        (glog_log_dir, po::value<std::string>(),"If specified, logfiles are written into this "
+                                                "directory instead of the default logging directory."
+                                                " [string:default=\"\"]")
+        ("ipc-thread-pool,i", po::value<int>(), "threads in frontend thread pool. [int:default=10]")
+        ("tests-use-real-graphics", po::value<bool>(), "Use real graphics in tests. [bool:default=false]")
+        ("tests-use-real-input", po::value<bool>(), "Use real input in tests. [bool:default=false]");
 
     return desc;
 }
@@ -456,10 +475,20 @@
 std::shared_ptr<ml::Logger> mir::DefaultServerConfiguration::the_logger()
 {
     return logger(
-        [this]()
+        [this]() -> std::shared_ptr<ml::Logger>
         {
-            // TODO use the_options() to configure logging
-            return std::make_shared<ml::DumbConsoleLogger>();
+            if (the_options()->is_set(glog))
+            {
+                return std::make_shared<ml::GlogLogger>(
+                    "mir",
+                    the_options()->get(glog_stderrthreshold, 2),
+                    the_options()->get(glog_minloglevel, 0),
+                    the_options()->get(glog_log_dir, ""));
+            }
+            else
+            {
+                return std::make_shared<ml::DumbConsoleLogger>();
+            }
         });
 }
 

=== modified file 'src/server/logging/CMakeLists.txt'
--- src/server/logging/CMakeLists.txt	2013-03-25 15:15:53 +0000
+++ src/server/logging/CMakeLists.txt	2013-03-29 10:46:21 +0000
@@ -2,6 +2,7 @@
   LOGGING_SOURCES
 
   dumb_console_logger.cpp
+  glog_logger.cpp
   session_mediator_report.cpp
   message_processor_report.cpp
   display_report.cpp

=== added file 'src/server/logging/glog_logger.cpp'
--- src/server/logging/glog_logger.cpp	1970-01-01 00:00:00 +0000
+++ src/server/logging/glog_logger.cpp	2013-03-29 10:46:21 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/logging/glog_logger.h"
+
+#include <glog/logging.h>
+
+#include <mutex>
+#include <cstdlib>
+
+mir::logging::GlogLogger::GlogLogger(
+    const char* argv0,
+    int stderrthreshold,
+    int minloglevel,
+    std::string const& log_dir)
+{
+    FLAGS_stderrthreshold = stderrthreshold;
+    FLAGS_minloglevel     = minloglevel;
+    FLAGS_log_dir         = log_dir;
+
+    static std::once_flag init_flag;
+
+    std::call_once(init_flag, [=]() { google::InitGoogleLogging(argv0); });
+}
+
+void mir::logging::GlogLogger::log(Severity severity, const std::string& message, const std::string& component)
+{
+    static int glog_level[] =
+    {
+        google::GLOG_FATAL,     // critical = 0,
+        google::GLOG_ERROR,     // error = 1,
+        google::GLOG_WARNING,   // warning = 2,
+        google::GLOG_INFO,      // informational = 3,
+        google::GLOG_INFO,      // debug = 4
+    };
+
+    // Since we're not collecting __FILE__ or __LINE__ this is misleading
+    google::LogMessage(__FILE__, __LINE__, glog_level[severity]).stream()
+        << '[' << component << "] " << message;
+}

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-13 08:09:52 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-29 10:46:21 +0000
@@ -44,6 +44,8 @@
 {
     MOCK_METHOD3(log,
                  void(ml::Logger::Severity, const std::string&, const std::string&));
+
+    ~MockLogger() noexcept(true) {}
 };
 
 class GBMDisplayTest : public ::testing::Test

=== modified file 'tests/unit-tests/logging/message_processor_report.cpp'
--- tests/unit-tests/logging/message_processor_report.cpp	2013-03-27 17:18:33 +0000
+++ tests/unit-tests/logging/message_processor_report.cpp	2013-03-29 10:46:21 +0000
@@ -40,6 +40,7 @@
 {
 public:
     MOCK_METHOD3(log, void(Severity severity, const std::string& message, const std::string& component));
+    ~MockLogger() noexcept(true) {}
 };
 
 struct MessageProcessorReport : public Test

=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2013-03-26 15:55:51 +0000
+++ tools/setup-partial-armhf-chroot.sh	2013-03-29 10:46:21 +0000
@@ -86,6 +86,12 @@
     if [ ! -f libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb ]; then
         wget "http://launchpadlibrarian.net/134086853/libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb"
     fi
+
+    if [ ! -f libgflags-dev_2.0-1_armhf.deb ]; then
+        wget "http://launchpadlibrarian.net/106868249/libgflags-dev_2.0-1_armhf.deb"
+    fi
+
+    dpkg -x libgflags-dev_2.0-1_armhf.deb .
     dpkg -x libgflags2_2.0-1_armhf.deb .
     dpkg -x libgoogle-glog0_0.3.2-4ubuntu1_armhf.deb .
     dpkg -x libgoogle-glog-dev_0.3.2-4ubuntu1_armhf.deb .