From c914d298604ef7ad3934c3c213d3f8822d6646d9 Mon Sep 17 00:00:00 2001
From: Guillaume Buisson <contact@guillaume.dev>
Date: ćšć, 20 5æ 2021 13:50:43 +0800
Subject: [PATCH] Several fixes (#120)
---
src/library/hw_identifier/hw_identifier_facade.cpp | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/library/hw_identifier/hw_identifier_facade.cpp b/src/library/hw_identifier/hw_identifier_facade.cpp
index 0b834db..83b6ba2 100644
--- a/src/library/hw_identifier/hw_identifier_facade.cpp
+++ b/src/library/hw_identifier/hw_identifier_facade.cpp
@@ -12,8 +12,6 @@
#include "../base/base.h"
#include "../base/logger.h"
-#include "../os/cpu_info.hpp"
-#include "../os/execution_environment.hpp"
#include "identification_strategy.hpp"
#include "hw_identifier.hpp"
@@ -23,14 +21,15 @@
using namespace std;
LCC_EVENT_TYPE HwIdentifierFacade::validate_pc_signature(const std::string& str_code) {
- HwIdentifier pc_id(str_code);
- LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy();
LCC_EVENT_TYPE result = IDENTIFIERS_MISMATCH;
try {
+ HwIdentifier pc_id(str_code);
+ LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy();
unique_ptr<IdentificationStrategy> strategy = IdentificationStrategy::get_strategy(id_strategy);
result = strategy->validate_identifier(pc_id);
} catch (logic_error& e) {
LOG_ERROR("Error validating identifier %s: %s", str_code.c_str(), e.what());
+ ((void)(e));
}
return result;
}
@@ -54,21 +53,9 @@
unique_ptr<IdentificationStrategy> strategy_ptr = IdentificationStrategy::get_strategy(strategy);
HwIdentifier pc_id;
FUNCTION_RETURN result = strategy_ptr->generate_pc_id(pc_id);
+ pc_id.set_use_environment_var(use_env_var);
if (result != FUNC_RET_OK) {
throw logic_error("strategy " + to_string(strategy_ptr->identification_strategy()) + " failed");
- }
- os::ExecutionEnvironment exec;
- os::VIRTUALIZATION virtualization = exec.getVirtualization();
- pc_id.set_virtual_environment(virtualization);
- pc_id.set_use_environment_var(use_env_var);
- if (virtualization != os::NONE) {
- bool isCloud = exec.is_cloud();
- if (isCloud) {
- pc_id.set_cloud_provider(exec.getCloudProvider());
- } else {
- os::CpuInfo cpu;
- pc_id.set_virtualization(cpu.virtualization_details());
- }
}
return pc_id.print();
}
--
Gitblit v1.9.1