commit 86cd572fc395d56dd081cec2fee3a7410b181c47
author Austin Schuh <austin.linux@gmail.com> Sun Apr 14 13:34:20 2019 -0700
committer Austin Schuh <austin.linux@gmail.com> Sun Apr 14 13:37:46 2019 -0700
tree 78982bb447c412e190208e824450e8ebca65ee0d
parent a1dc3b28df7b9e7f90c82c931ded044405d42eb6
parent 9d8230068fc508759615dfb7167dc9afb35994bf

Merge commit '9983e31ac159356438f940406f2d9a74a92b4ee7' into seasocks_update

Took the opertunity to refactor seasocks_logger since it wouldn't
compile.

Change-Id: I087b70bf4758377ba43b709a8e9bbdcad49c190e

y2016/dashboard/dashboard.cc

diff --git a/y2016/dashboard/dashboard.cc b/y2016/dashboard/dashboard.cc
index 5f0a33f..04e91f6 100644
--- a/y2016/dashboard/dashboard.cc
+++ b/y2016/dashboard/dashboard.cc
@@ -13,9 +13,10 @@
 
 #include "aos/init.h"
 #include "aos/logging/logging.h"
+#include "aos/mutex/mutex.h"
+#include "aos/seasocks/seasocks_logger.h"
 #include "aos/time/time.h"
 #include "aos/util/phased_loop.h"
-#include "aos/mutex/mutex.h"
 
 #include "frc971/autonomous/auto.q.h"
 
@@ -261,32 +262,6 @@
   data_collector_thread_.join();
 }
 
-SeasocksLogger::SeasocksLogger(Level min_level_to_log)
-    : PrintfLogger(min_level_to_log) {}
-
-void SeasocksLogger::log(Level level, const char *message) {
-  // Convert Seasocks error codes to AOS.
-  log_level aos_level;
-  switch (level) {
-    case seasocks::Logger::INFO:
-      aos_level = INFO;
-      break;
-    case seasocks::Logger::WARNING:
-      aos_level = WARNING;
-      break;
-    case seasocks::Logger::ERROR:
-    case seasocks::Logger::SEVERE:
-      aos_level = ERROR;
-      break;
-    case seasocks::Logger::DEBUG:
-    case seasocks::Logger::ACCESS:
-    default:
-      aos_level = DEBUG;
-      break;
-  }
-  LOG(aos_level, "Seasocks: %s\n", message);
-}
-
 }  // namespace dashboard
 }  // namespace y2016
 
@@ -297,7 +272,7 @@
   ::aos::InitNRT();
 
   ::seasocks::Server server(::std::shared_ptr<seasocks::Logger>(
-      new ::y2016::dashboard::SeasocksLogger(seasocks::Logger::INFO)));
+      new ::aos::seasocks::SeasocksLogger(::seasocks::Logger::Level::Info)));
   ::y2016::dashboard::SocketHandler socket_handler;
 
   server.addWebSocketHandler(