Merge "Switch to appcontroller library" into halibut

2 files changed, 13 insertions, 11 deletions

diff --git a/src/plugins/utilities/logging/Logger.cpp b/src/plugins/utilities/logging/Logger.cpp
index b310695..e09ba9a 100644
--- a/src/plugins/utilities/logging/Logger.cpp
+++ b/src/plugins/utilities/logging/Logger.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2019 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -18,11 +19,11 @@ namespace utilities {
 namespace logging {
 
 // Constructor
-Logger::Logger(AFB_ApiT api) {
+Logger::Logger(afb_api_t api) {
     mApi = api;
 }
 
-unique_ptr<Logger> Logger::create(AFB_ApiT api) {
+unique_ptr<Logger> Logger::create(afb_api_t api) {
     auto logger = std::unique_ptr<Logger>(new Logger(api));
     return logger;
 }
@@ -31,19 +32,19 @@ void Logger::log(Level level, const std::string& tag, const std::string& message
     string format_msg = "Tag: " + tag + ", message: " + message;
     switch (level) {
         case Level::NOTICE:
-            AFB_ApiNotice(mApi, format_msg.c_str());
+            AFB_API_NOTICE(mApi, format_msg.c_str());
             break;
         case Level::WARNING:
-            AFB_ApiWarning(mApi, format_msg.c_str());
+            AFB_API_WARNING(mApi, format_msg.c_str());
             break;
         case Level::DEBUG:
-            AFB_ApiDebug(mApi, format_msg.c_str());
+            AFB_API_DEBUG(mApi, format_msg.c_str());
             break;
         case Level::ERROR:
-            AFB_ApiError(mApi, format_msg.c_str());
+            AFB_API_ERROR(mApi, format_msg.c_str());
             break;
         case Level::INFO:
-            AFB_ApiInfo(mApi, format_msg.c_str());
+            AFB_API_INFO(mApi, format_msg.c_str());
             break;
         default:
             break;
diff --git a/src/plugins/utilities/logging/Logger.h b/src/plugins/utilities/logging/Logger.h
index d1d0196..78a4a22 100644
--- a/src/plugins/utilities/logging/Logger.h
+++ b/src/plugins/utilities/logging/Logger.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2019 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
 
 extern "C" {
 #define AFB_BINDING_VERSION 3
-#include "afb-definitions.h"
+#include <afb/afb-binding.h>
 #include "ctl-plugin.h"
 };
 
@@ -32,17 +33,17 @@ namespace logging {
 
 class Logger : public vshlcore::common::interfaces::ILogger {
 public:
-  static std::unique_ptr<Logger> create(AFB_ApiT api);
+  static std::unique_ptr<Logger> create(afb_api_t api);
 
   // ILogger interface
   void log(Level level, const std::string &tag,
            const std::string &message) override;
 
 private:
-  Logger(AFB_ApiT api);
+  Logger(afb_api_t api);
 
   // Binding API reference
-  AFB_ApiT mApi;
+  afb_api_t mApi;
 };
 
 } // namespace logging