From 77ee9d48d0934d460a502c3f27db214fc7178fb7 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Wed, 22 Nov 2023 09:21:31 -0800 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-13172 Signed-off-by: stephb9959 --- CMakeLists.txt | 2 +- build | 2 +- src/framework/MicroService.cpp | 2 +- src/framework/MicroServiceFuncs.cpp | 4 ++++ src/framework/MicroServiceFuncs.h | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18ef5e3cf..3f0c29479 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.13) -project(owgw VERSION 2.11.0) +project(owgw VERSION 3.0.0) set(CMAKE_CXX_STANDARD 17) diff --git a/build b/build index 4800c7da6..d8263ee98 100644 --- a/build +++ b/build @@ -1 +1 @@ -58 \ No newline at end of file +2 \ No newline at end of file diff --git a/src/framework/MicroService.cpp b/src/framework/MicroService.cpp index 94185e0c9..5d517d9ff 100644 --- a/src/framework/MicroService.cpp +++ b/src/framework/MicroService.cpp @@ -231,7 +231,7 @@ namespace OpenWifi { "logging.format", "%Y-%m-%d %H:%M:%S.%i %s: [%p][thr:%I] %t"); auto UseAsyncLogs_ = MicroService::instance().ConfigGetBool("logging.asynch", true); auto DisableWebSocketLogging = - MicroService::instance().ConfigGetBool("logging.websocket.disable", true); + MicroService::instance().ConfigGetBool("logging.websocket", false); if (LoggingDestination == "null") { Poco::AutoPtr DevNull(new Poco::NullChannel); diff --git a/src/framework/MicroServiceFuncs.cpp b/src/framework/MicroServiceFuncs.cpp index 666498130..6ebf457d2 100644 --- a/src/framework/MicroServiceFuncs.cpp +++ b/src/framework/MicroServiceFuncs.cpp @@ -129,4 +129,8 @@ namespace OpenWifi { return ALBHealthCheckServer()->RegisterExtendedHealthMessage(Callback); } + std::string MicroServiceAccessKey() { + return MicroService::instance().Hash(); + } + } // namespace OpenWifi diff --git a/src/framework/MicroServiceFuncs.h b/src/framework/MicroServiceFuncs.h index 9c618b896..5ceebb6ce 100644 --- a/src/framework/MicroServiceFuncs.h +++ b/src/framework/MicroServiceFuncs.h @@ -22,6 +22,7 @@ namespace OpenWifi { std::string MicroServicePublicEndPoint(); std::string MicroServiceConfigGetString(const std::string &Key, const std::string &DefaultValue); + std::string MicroServiceAccessKey(); bool MicroServiceConfigGetBool(const std::string &Key, bool DefaultValue); std::uint64_t MicroServiceConfigGetInt(const std::string &Key, std::uint64_t DefaultValue); std::string MicroServicePrivateEndPoint();