Merge commit '9983e31ac159356438f940406f2d9a74a92b4ee7' into seasocks_update
Took the opertunity to refactor seasocks_logger since it wouldn't
compile.
Change-Id: I087b70bf4758377ba43b709a8e9bbdcad49c190e
diff --git a/y2016/dashboard/BUILD b/y2016/dashboard/BUILD
index 31038b5..2892814 100644
--- a/y2016/dashboard/BUILD
+++ b/y2016/dashboard/BUILD
@@ -1,37 +1,41 @@
-load('//aos/seasocks:gen_embedded.bzl', 'gen_embedded')
-load('//aos/downloader:downloader.bzl', 'aos_downloader_dir')
+load("//aos/seasocks:gen_embedded.bzl", "gen_embedded")
+load("//aos/downloader:downloader.bzl", "aos_downloader_dir")
gen_embedded(
- name = 'gen_embedded',
- srcs = glob(['www_defaults/**/*'], exclude=['www/**/*']),
+ name = "gen_embedded",
+ srcs = glob(
+ ["www_defaults/**/*"],
+ exclude = ["www/**/*"],
+ ),
)
aos_downloader_dir(
- name = 'www_files',
- visibility = ['//visibility:public'],
- srcs = glob([
- 'www/**/*',
- ]),
- dir = "www",
+ name = "www_files",
+ srcs = glob([
+ "www/**/*",
+ ]),
+ dir = "www",
+ visibility = ["//visibility:public"],
)
cc_binary(
- name = 'dashboard',
- visibility = ['//visibility:public'],
- srcs = [
- 'dashboard.cc',
- 'dashboard.h',
- ],
- deps = [
- ':gen_embedded',
- '//aos:init',
- '//aos/logging',
- '//aos/util:phased_loop',
- '//aos/time:time',
- '//frc971/autonomous:auto_queue',
- '//third_party/seasocks',
- '//y2016/vision:vision_queue',
- '//y2016/control_loops/superstructure:superstructure_queue',
- '//y2016/queues:ball_detector',
- ],
+ name = "dashboard",
+ srcs = [
+ "dashboard.cc",
+ "dashboard.h",
+ ],
+ visibility = ["//visibility:public"],
+ deps = [
+ ":gen_embedded",
+ "//aos:init",
+ "//aos/logging",
+ "//aos/seasocks:seasocks_logger",
+ "//aos/time",
+ "//aos/util:phased_loop",
+ "//frc971/autonomous:auto_queue",
+ "//third_party/seasocks",
+ "//y2016/control_loops/superstructure:superstructure_queue",
+ "//y2016/queues:ball_detector",
+ "//y2016/vision:vision_queue",
+ ],
)
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(