Skip to content
Snippets Groups Projects
Verified Commit 824082f8 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: fix logging setup

parent 1aba35eb
Branches
Tags
1 merge request!3Better Error Handling and Logging
Pipeline #10864 failed
...@@ -508,7 +508,8 @@ auto ConfigurationManager::InitializeDefaults() -> int { ...@@ -508,7 +508,8 @@ auto ConfigurationManager::InitializeDefaults() -> int {
mLoadSingleJSONConfiguration(*configuration_file_path); mLoadSingleJSONConfiguration(*configuration_file_path);
} }
if (this->json_configuration.as_object().contains("logging")) { if (this->json_configuration.is_object() &&
this->json_configuration.as_object().contains("logging")) {
LoggingConfiguration logging_configuration = LoggingConfiguration logging_configuration =
logging_configuration_helper.CreateLoggingConfiguration( logging_configuration_helper.CreateLoggingConfiguration(
json_configuration.at("logging").as_object()); json_configuration.at("logging").as_object());
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "caosdb/transaction.h" #include "caosdb/transaction.h"
#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for EntityTransactionS... #include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for EntityTransactionS...
#include "caosdb/entity/v1alpha1/main.pb.h" // for RetrieveRequest #include "caosdb/entity/v1alpha1/main.pb.h" // for RetrieveRequest
#include "caosdb/status_code.h" // for StatusCode, AUTHEN...
#include "grpcpp/grpcpp.h" // for CompletionQueue #include "grpcpp/grpcpp.h" // for CompletionQueue
#include "grpcpp/impl/codegen/async_unary_call.h" // for ClientAsyncRespons... #include "grpcpp/impl/codegen/async_unary_call.h" // for ClientAsyncRespons...
#include "grpcpp/impl/codegen/client_context.h" // for ClientContext #include "grpcpp/impl/codegen/client_context.h" // for ClientContext
...@@ -27,7 +28,9 @@ ...@@ -27,7 +28,9 @@
#include "grpcpp/impl/codegen/status.h" // for Status #include "grpcpp/impl/codegen/status.h" // for Status
#include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH... #include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH...
#include <cassert> // for assert #include <cassert> // for assert
#include <map> // for map
#include <memory> // for allocator, unique_ptr #include <memory> // for allocator, unique_ptr
#include <stdexcept> // for out_of_range
#include <utility> // for move #include <utility> // for move
namespace caosdb { namespace caosdb {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment