mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-20 04:04:00 +00:00
Last minute refactoring
This commit is contained in:
+34
-34
@@ -45,8 +45,8 @@ class IFC_PARSE_API log_message {
|
||||
const std::string& code,
|
||||
const std::string& timestamp,
|
||||
const std::string& message,
|
||||
const express::Base& instance = express::Base(),
|
||||
const express::Base& current_product = express::Base());
|
||||
const express::base& instance = express::base(),
|
||||
const express::base& current_product = express::base());
|
||||
};
|
||||
|
||||
class IFC_PARSE_API logger {
|
||||
@@ -57,13 +57,13 @@ class IFC_PARSE_API logger {
|
||||
LOG_NOTICE,
|
||||
LOG_WARNING,
|
||||
LOG_ERROR
|
||||
} Severity;
|
||||
} severity;
|
||||
|
||||
typedef enum {
|
||||
FMT_PLAIN,
|
||||
FMT_JSON,
|
||||
FMT_INMEMORY
|
||||
} Format;
|
||||
} format;
|
||||
|
||||
private:
|
||||
std::vector<log_message> log_messages_;
|
||||
@@ -75,11 +75,11 @@ class IFC_PARSE_API logger {
|
||||
std::wostream* wlog2_ = nullptr;
|
||||
|
||||
std::stringstream log_stream_;
|
||||
express::Base current_product_;
|
||||
express::base current_product_;
|
||||
|
||||
Severity verbosity_ = LOG_NOTICE;
|
||||
Format format_ = FMT_PLAIN;
|
||||
Severity max_severity_ = LOG_NOTICE;
|
||||
severity verbosity_ = LOG_NOTICE;
|
||||
format format_ = FMT_PLAIN;
|
||||
severity max_severity_ = LOG_NOTICE;
|
||||
|
||||
std::optional<long long> first_timepoint_;
|
||||
std::map<std::string, double> performance_statistics_;
|
||||
@@ -88,9 +88,9 @@ class IFC_PARSE_API logger {
|
||||
bool print_perf_stats_on_element_ = false;
|
||||
std::mutex mutex_;
|
||||
|
||||
const express::Base& current_product() const;
|
||||
void current_product(const express::Base& product);
|
||||
void message(Severity type, const std::string& code, const std::string& message, const express::Base& instance);
|
||||
const express::base& current_product() const;
|
||||
void current_product(const express::base& product);
|
||||
void message(severity type, const std::string& code, const std::string& message, const express::base& instance);
|
||||
|
||||
public:
|
||||
logger() = default;
|
||||
@@ -99,39 +99,39 @@ class IFC_PARSE_API logger {
|
||||
|
||||
static logger& root();
|
||||
|
||||
void set_product(std::optional<express::Base> product);
|
||||
void set_product(const express::Base& product) { set_product(std::optional<express::Base>(product)); }
|
||||
void set_product(std::optional<express::base> product);
|
||||
void set_product(const express::base& product) { set_product(std::optional<express::base>(product)); }
|
||||
|
||||
void set_output(std::wostream* stream1, std::wostream* stream2);
|
||||
void set_output(std::ostream* stream1, std::ostream* stream2);
|
||||
|
||||
void verbosity(Severity severity);
|
||||
Severity verbosity() const;
|
||||
Severity max_severity() const;
|
||||
void verbosity(severity severity);
|
||||
severity verbosity() const;
|
||||
severity max_severity() const;
|
||||
|
||||
void output_format(Format format);
|
||||
Format output_format() const;
|
||||
void output_format(format format);
|
||||
format output_format() const;
|
||||
|
||||
void message(Severity type, const std::string& message, const express::Base& instance = express::Base());
|
||||
void message(Severity type, const std::exception& exception, const express::Base& instance = express::Base());
|
||||
void message(Severity type, const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::Base& instance = express::Base());
|
||||
void message(Severity type, const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::Base& instance = express::Base());
|
||||
void message(severity type, const std::string& message, const express::base& instance = express::base());
|
||||
void message(severity type, const std::exception& exception, const express::base& instance = express::base());
|
||||
void message(severity type, const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::base& instance = express::base());
|
||||
void message(severity type, const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::base& instance = express::base());
|
||||
|
||||
void notice(const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_NOTICE, message, instance); }
|
||||
void warning(const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_WARNING, message, instance); }
|
||||
void error(const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_ERROR, message, instance); }
|
||||
void notice(const std::string& message, const express::base& instance = express::base()) { this->message(LOG_NOTICE, message, instance); }
|
||||
void warning(const std::string& message, const express::base& instance = express::base()) { this->message(LOG_WARNING, message, instance); }
|
||||
void error(const std::string& message, const express::base& instance = express::base()) { this->message(LOG_ERROR, message, instance); }
|
||||
|
||||
void notice(const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_NOTICE, exception, instance); }
|
||||
void warning(const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_WARNING, exception, instance); }
|
||||
void error(const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_ERROR, exception, instance); }
|
||||
void notice(const std::exception& exception, const express::base& instance = express::base()) { message(LOG_NOTICE, exception, instance); }
|
||||
void warning(const std::exception& exception, const express::base& instance = express::base()) { message(LOG_WARNING, exception, instance); }
|
||||
void error(const std::exception& exception, const express::base& instance = express::base()) { message(LOG_ERROR, exception, instance); }
|
||||
|
||||
void notice(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_NOTICE, code_prefix, code_number, message, instance); }
|
||||
void warning(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_WARNING, code_prefix, code_number, message, instance); }
|
||||
void error(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::Base& instance = express::Base()) { this->message(LOG_ERROR, code_prefix, code_number, message, instance); }
|
||||
void notice(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::base& instance = express::base()) { this->message(LOG_NOTICE, code_prefix, code_number, message, instance); }
|
||||
void warning(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::base& instance = express::base()) { this->message(LOG_WARNING, code_prefix, code_number, message, instance); }
|
||||
void error(const char (&code_prefix)[4], uint16_t code_number, const std::string& message, const express::base& instance = express::base()) { this->message(LOG_ERROR, code_prefix, code_number, message, instance); }
|
||||
|
||||
void notice(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_NOTICE, code_prefix, code_number, exception, instance); }
|
||||
void warning(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_WARNING, code_prefix, code_number, exception, instance); }
|
||||
void error(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::Base& instance = express::Base()) { message(LOG_ERROR, code_prefix, code_number, exception, instance); }
|
||||
void notice(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::base& instance = express::base()) { message(LOG_NOTICE, code_prefix, code_number, exception, instance); }
|
||||
void warning(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::base& instance = express::base()) { message(LOG_WARNING, code_prefix, code_number, exception, instance); }
|
||||
void error(const char (&code_prefix)[4], uint16_t code_number, const std::exception& exception, const express::base& instance = express::base()) { message(LOG_ERROR, code_prefix, code_number, exception, instance); }
|
||||
|
||||
void status(const std::string& message, bool new_line = true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user