Merge pull request #972 from mapbox/log_cleanup

Refactoring of the log system

4 files changed, 12 insertions, 83 deletions

diff --git a/platform/android/log_android.cpp b/platform/android/log_android.cpp
index 5e40ce33bd..9de8232bac 100644
--- a/platform/android/log_android.cpp
+++ b/platform/android/log_android.cpp
@@ -1,7 +1,5 @@
-#include <mbgl/platform/android/log_android.hpp>
+#include <mbgl/platform/log.hpp>
 
-#include <iostream>
-#include <cstdarg>
 #define __STDC_FORMAT_MACROS // NDK bug workaround: https://code.google.com/p/android/issues/detail?id=72349
 #include <cinttypes>
 
@@ -9,7 +7,9 @@
 
 namespace mbgl {
 
-int AndroidLogBackend::severityToPriority(EventSeverity severity) {
+namespace {
+
+int severityToPriority(EventSeverity severity) {
     switch(severity) {
     case EventSeverity::Debug:
         return ANDROID_LOG_DEBUG;
@@ -28,31 +28,9 @@ int AndroidLogBackend::severityToPriority(EventSeverity severity) {
     }
 }
 
-void AndroidLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
-    __android_log_print(severityToPriority(severity), EventClass(event).c_str(), "%s", msg.c_str());
-}
-
-void AndroidLogBackend::record(EventSeverity severity, Event event, const char* format, ...) {
-    va_list args;
-    va_start(args, format);
-
-    const int len = vsnprintf(nullptr, 0, format, args) + 1;
-    char* buf = new char[len];
-    vsnprintf(buf, len, format, args);
-
-    va_end(args);
-
-    __android_log_print(severityToPriority(severity), EventClass(event).c_str(), "%s", buf);
-
-    delete buf;
-    buf  = nullptr;
-}
-
-void AndroidLogBackend::record(EventSeverity severity, Event event, int64_t code) {
-    __android_log_print(severityToPriority(severity), EventClass(event).c_str(), "(%" PRId64 ")", code);
-}
+} // namespace
 
-void AndroidLogBackend::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
+void Log::platformRecord(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
     __android_log_print(severityToPriority(severity), EventClass(event).c_str(), "(%" PRId64 ") %s", code, msg.c_str());
 }
 
diff --git a/platform/darwin/log_nslog.mm b/platform/darwin/log_nslog.mm
index a82d78a01f..5d53ed812f 100644
--- a/platform/darwin/log_nslog.mm
+++ b/platform/darwin/log_nslog.mm
@@ -1,37 +1,11 @@
-#include <mbgl/platform/darwin/log_nslog.hpp>
+#include <mbgl/platform/log.hpp>
 
 #import <Foundation/Foundation.h>
 
-#include <cstdarg>
-
 namespace mbgl {
 
-void NSLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
-    NSString *message =
-        [[NSString alloc] initWithBytes:msg.data() length:msg.size() encoding:NSUTF8StringEncoding];
-    NSLog(@"[%s] %s: %@", EventSeverityClass(severity).c_str(), EventClass(event).c_str(), message);
-}
-
-void NSLogBackend::record(EventSeverity severity, Event event, const char *format, ...) {
-    va_list args;
-    va_start(args, format);
-    const size_t len = vsnprintf(NULL, 0, format, args);
-    va_end(args);
-    std::unique_ptr<char[]> buffer(new char[len + 1]);
-    va_start(args, format);
-    vsnprintf(buffer.get(), len + 1, format, args);
-    va_end(args);
-    NSLog(@"[%s] %s: %s", EventSeverityClass(severity).c_str(), EventClass(event).c_str(),
-          buffer.get());
-}
-
-void NSLogBackend::record(EventSeverity severity, Event event, int64_t code) {
-    NSLog(@"[%s] %s: (%lld)", EventSeverityClass(severity).c_str(), EventClass(event).c_str(),
-          code);
-}
-
-void NSLogBackend::record(EventSeverity severity, Event event, int64_t code,
-                          const std::string &msg) {
+void Log::platformRecord(EventSeverity severity, Event event, int64_t code,
+                         const std::string &msg) {
     NSString *message =
         [[NSString alloc] initWithBytes:msg.data() length:msg.size() encoding:NSUTF8StringEncoding];
     NSLog(@"[%s] %s: (%lld) %@", EventSeverityClass(severity).c_str(), EventClass(event).c_str(),
diff --git a/platform/default/log_stderr.cpp b/platform/default/log_stderr.cpp
index 62938b6d63..3305176d96 100644
--- a/platform/default/log_stderr.cpp
+++ b/platform/default/log_stderr.cpp
@@ -1,30 +1,11 @@
-#include <mbgl/platform/default/log_stderr.hpp>
+#include <mbgl/platform/log.hpp>
 
 #include <iostream>
-#include <cstdarg>
 
 namespace mbgl {
 
-void StderrLogBackend::record(EventSeverity severity, Event event, const std::string &msg) {
-    std::cerr << "[" << severity << "] " << event << ": " << msg << std::endl;
-}
-
-void StderrLogBackend::record(EventSeverity severity, Event event, const char* format, ...) {
-    std::cerr << "[" << severity << "] " << event << ": ";
-    va_list args;
-    va_start(args, format);
-    vfprintf(stderr, format, args);
-    va_end(args);
-    std::cerr << std::endl;
-}
-
-void StderrLogBackend::record(EventSeverity severity, Event event, int64_t code) {
-    std::cerr << "[" << severity << "] " << event << ": (" << code << ")" << std::endl;
-}
-
-void StderrLogBackend::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
+void Log::platformRecord(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
     std::cerr << "[" << severity << "] " << event << ": (" << code << ") " << msg << std::endl;
-
 }
 
 }
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 3629430263..57760717d9 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -1,6 +1,6 @@
 #import "MGLMapView.h"
 
-#import <mbgl/platform/darwin/log_nslog.hpp>
+#import <mbgl/platform/log.hpp>
 #import <mbgl/platform/gl.hpp>
 
 #import <GLKit/GLKit.h>
@@ -181,10 +181,6 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
 
 - (BOOL)commonInit
 {
-    // set logging backend
-    //
-    mbgl::Log::Set<mbgl::NSLogBackend>();
-
     // create context
     //
     _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];