diff --git a/CMakeLists.txt b/CMakeLists.txt index c02bd56e1..b497a3092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ else () add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/server COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server - #COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/defaults ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/web ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index f919ead4c..f3579dcd9 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -82,9 +82,4 @@ - - - - - diff --git a/src/client/spark_api/Properties/AssemblyAttributes.cs b/src/client/spark_api/Properties/AssemblyAttributes.cs index c81bd6586..0843c0cd3 100644 --- a/src/client/spark_api/Properties/AssemblyAttributes.cs +++ b/src/client/spark_api/Properties/AssemblyAttributes.cs @@ -3,6 +3,5 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("spark_core")] [assembly: InternalsVisibleTo("sparkcmd")] [assembly: InternalsVisibleTo("spark_test")] -[assembly: InternalsVisibleTo("spark_sdk")] [assembly: InternalsVisibleTo("spark_fix")] diff --git a/src/client/spark_api/utils/Log.cs b/src/client/spark_api/utils/Log.cs index d07b338ca..f6eb912e1 100644 --- a/src/client/spark_api/utils/Log.cs +++ b/src/client/spark_api/utils/Log.cs @@ -32,12 +32,14 @@ namespace bts { Testing, Latency, DataFlow, - Plugin + Plugin, + ClientSdk // Please keep this list in sync with logging.h/logging.cpp } - readonly struct Logger { + + public readonly struct Logger { readonly Subsystem _sys; - public Logger(Subsystem sys) { + internal Logger(Subsystem sys) { _sys = sys; } @@ -61,19 +63,20 @@ namespace bts { static extern void Logger_log (Level level, Subsystem subsystem, string message, string file, int line); } - static class Log { - public static Logger Gen => new Logger(Subsystem.gen); - public static Logger Config => new Logger(Subsystem.Config); - public static Logger QBus => new Logger(Subsystem.QBus); - public static Logger Md => new Logger(Subsystem.md); - public static Logger Api => new Logger(Subsystem.Api); - public static Logger Persist => new Logger(Subsystem.Persist); - public static Logger User => new Logger(Subsystem.User); - public static Logger OrderMan => new Logger(Subsystem.OrderMan); - public static Logger Assert => new Logger(Subsystem.Assert); - public static Logger Ui => new Logger(Subsystem.Ui); - public static Logger Testing => new Logger(Subsystem.Testing); - public static Logger DataFlow => new Logger(Subsystem.DataFlow); + public static class Log { + internal static Logger Gen => new Logger(Subsystem.gen); + internal static Logger Config => new Logger(Subsystem.Config); + internal static Logger QBus => new Logger(Subsystem.QBus); + internal static Logger Md => new Logger(Subsystem.md); + internal static Logger Api => new Logger(Subsystem.Api); + internal static Logger Persist => new Logger(Subsystem.Persist); + internal static Logger User => new Logger(Subsystem.User); + internal static Logger OrderMan => new Logger(Subsystem.OrderMan); + internal static Logger Assert => new Logger(Subsystem.Assert); + internal static Logger Ui => new Logger(Subsystem.Ui); + internal static Logger Testing => new Logger(Subsystem.Testing); + internal static Logger DataFlow => new Logger(Subsystem.DataFlow); + public static Logger ClientSdk => new Logger(Subsystem.ClientSdk); [Conditional("DEBUG")] @@ -99,10 +102,10 @@ namespace bts { assert(o == null); } delegate void on_crash_callback([MarshalAs(UnmanagedType.LPStr)]string msg, [MarshalAs(UnmanagedType.LPStr)] string details); - public static void system_is_crashing(string message, object details) { + internal static void system_is_crashing(string message, object details) { OnSystemCrashing?.Invoke(message, details); } - public static event Action OnSystemCrashing; + internal static event Action OnSystemCrashing; - } + } } diff --git a/src/client/spark_sdk/samples/SDKMain.cs b/src/client/spark_sdk/samples/SDKMain.cs index 0df8bf030..5a9f5452d 100644 --- a/src/client/spark_sdk/samples/SDKMain.cs +++ b/src/client/spark_sdk/samples/SDKMain.cs @@ -24,7 +24,7 @@ namespace bts.sdk } public static void Main(string[] args) { - bts.Log.Gen.info("Welcome to the BTS Client Side SDK example"); + Log.ClientSdk.info("Welcome to the BTS Client Side SDK example"); if (args.FirstOrDefault() == "users") { user_test(); diff --git a/src/client/spark_sdk/spark_sdk.csproj b/src/client/spark_sdk/spark_sdk.csproj index e2165daf3..2fd523f62 100644 --- a/src/client/spark_sdk/spark_sdk.csproj +++ b/src/client/spark_sdk/spark_sdk.csproj @@ -57,7 +57,6 @@ - @@ -88,13 +87,9 @@ - - <_Defaults Include="..\..\defaults\*.*" /> - - diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 7a2b5d472..2bc9cd150 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -76,12 +76,6 @@ if(NOT config_defaults_str STREQUAL old_defaults_str) endif() -# copy defaults to output directory -#foreach (cfg_file_path ${Conf_Defaults}) -# get_filename_component(cfg_file_name ${cfg_file_path} NAME) -# configure_file(${cfg_file_path} ${CMAKE_BINARY_DIR}/src/server/sparkd/defaults/${cfg_file_name}) -#endforeach(cfg_file_path) - # lib if (WIN32) add_library(libspark SHARED diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index dc4e2281f..919234a6e 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -42,7 +42,8 @@ constexpr log::Subsystem Mercury {ExSim.ordinal+1 }; constexpr log::Subsystem Testing {Mercury.ordinal+1 }; constexpr log::Subsystem Latency {Testing.ordinal+1 }; constexpr log::Subsystem DataFlow {Latency.ordinal+1 }; -constexpr log::Subsystem Plugin {DataFlow.ordinal+1 }; +constexpr log::Subsystem Plugin {DataFlow.ordinal+1 }; +constexpr log::Subsystem ClientSdk {Plugin.ordinal+1 }; struct LoggerHandle { LoggerHandle(LoggerHandle const&) = delete;