move AdvancedLogger.h to minifi-api/include/minifi-cpp/core/logging/AdvancedLogger.h

Author: martinzink

extensions/aws/utils/AWSSdkLogger.cpp

@@ -17,10 +17,11 @@
  */
 #include "AWSSdkLogger.h"
 
-#include <cstdio>
 #include <cstdarg>
+#include <cstdio>
 
 #include "aws/core/utils/logging/LogLevel.h"
+#include "minifi-cpp/core/logging/AdvancedLogger.h"
 #include "minifi-cpp/utils/gsl.h"
 
 namespace org::apache::nifi::minifi::aws::utils {

extensions/python/PythonCreator.h

@@ -32,15 +32,16 @@
 #include "core/Resource.h"
 #include "core/logging/LoggerFactory.h"
 #include "minifi-cpp/agent/agent_version.h"
+#include "minifi-cpp/core/ProcessorDescriptor.h"
+#include "minifi-cpp/core/logging/AdvancedLogger.h"
 #include "range/v3/algorithm.hpp"
 #include "range/v3/view/filter.hpp"
 #include "utils/Environment.h"
+#include "utils/ExtensionInitUtils.h"
 #include "utils/Locations.h"
 #include "utils/StringUtils.h"
 #include "utils/file/FilePattern.h"
 #include "utils/file/FileUtils.h"
-#include "minifi-cpp/core/ProcessorDescriptor.h"
-#include "utils/ExtensionInitUtils.h"
 
 namespace org::apache::nifi::minifi::extensions::python {
 

extensions/standard-processors/processors/LogAttribute.h

@@ -25,14 +25,14 @@
 #include <vector>
 
 #include "core/Core.h"
+#include "core/ProcessSession.h"
 #include "core/ProcessorImpl.h"
+#include "core/PropertyDefinitionBuilder.h"
 #include "minifi-cpp/core/ProcessContext.h"
-#include "core/ProcessSession.h"
 #include "minifi-cpp/core/PropertyDefinition.h"
-#include "core/PropertyDefinitionBuilder.h"
 #include "minifi-cpp/core/PropertyValidator.h"
 #include "minifi-cpp/core/RelationshipDefinition.h"
-#include "core/logging/LoggerFactory.h"
+#include "minifi-cpp/core/logging/AdvancedLogger.h"
 #include "minifi-cpp/utils/Export.h"
 
 namespace org::apache::nifi::minifi::processors {

libminifi/include/core/logging/LoggerBase.h

@@ -17,26 +17,18 @@
  */
 #pragma once
 
-#include <string>
-#include <mutex>
 #include <memory>
+#include <mutex>
 #include <optional>
-#include <sstream>
-#include <utility>
-#include <iostream>
-#include <vector>
-#include <algorithm>
+#include <string>
 
+#include "fmt/std.h"
+#include "minifi-cpp/core/logging/AdvancedLogger.h"
+#include "minifi-cpp/core/logging/Logger.h"
 #include "spdlog/common.h"
 #include "spdlog/logger.h"
-#include "minifi-cpp/utils/gsl.h"
 #include "utils/ConfigurationUtils.h"
 #include "utils/Enum.h"
-#include "utils/GeneralUtils.h"
-#include "fmt/chrono.h"
-#include "fmt/std.h"
-#include "fmt/ostream.h"
-#include "minifi-cpp/core/logging/Logger.h"
 
 namespace org::apache::nifi::minifi::core::logging {
 

libminifi/src/c2/HeartbeatLogger.cpp

@@ -16,7 +16,9 @@
  */
 
 #include "c2/HeartbeatLogger.h"
+
 #include "core/Resource.h"
+#include "minifi-cpp/core/logging/AdvancedLogger.h"
 
 namespace org::apache::nifi::minifi::c2 {
 

minifi-api/common/include/minifi-cpp/core/logging/Logger.h

@@ -99,25 +99,4 @@ class Logger {
   }
 };
 
-class AdvancedLogger : public Logger {
- public:
-  virtual void set_max_log_size(int size) = 0;
-  [[nodiscard]] virtual LOG_LEVEL level() const = 0;
-
-  static std::expected<void, std::error_code> setMaxLogSize(Logger* logger, int size) {
-    if (const auto advanced_logger = dynamic_cast<AdvancedLogger*>(logger)) {
-      advanced_logger->set_max_log_size(size);
-      return {};
-    }
-    return std::unexpected{std::make_error_code(std::errc::invalid_argument)};
-  }
-
-  static std::expected<LOG_LEVEL, std::error_code> getLevel(Logger* logger) {
-    if (const auto advanced_logger = dynamic_cast<AdvancedLogger*>(logger)) {
-      return advanced_logger->level();
-    }
-    return std::unexpected{std::make_error_code(std::errc::invalid_argument)};
-  }
-};
-
 }  // namespace org::apache::nifi::minifi::core::logging

minifi-api/include/minifi-cpp/core/logging/AdvancedLogger.h

@@ -0,0 +1,43 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "minifi-cpp/core/logging/Logger.h"
+namespace org::apache::nifi::minifi::core::logging {
+class AdvancedLogger : public Logger {
+ public:
+  virtual void set_max_log_size(int size) = 0;
+  [[nodiscard]] virtual LOG_LEVEL level() const = 0;
+
+  static std::expected<void, std::error_code> setMaxLogSize(Logger* logger, int size) {
+    if (const auto advanced_logger = dynamic_cast<AdvancedLogger*>(logger)) {
+      advanced_logger->set_max_log_size(size);
+      return {};
+    }
+    return std::unexpected{std::make_error_code(std::errc::invalid_argument)};
+  }
+
+  static std::expected<LOG_LEVEL, std::error_code> getLevel(Logger* logger) {
+    if (const auto advanced_logger = dynamic_cast<AdvancedLogger*>(logger)) {
+      return advanced_logger->level();
+    }
+    return std::unexpected{std::make_error_code(std::errc::invalid_argument)};
+  }
+};
+}  // namespace org::apache::nifi::minifi::core::logging